Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Naga 0.19 #73

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Update to Naga 0.19 #73

merged 2 commits into from
Jan 17, 2024

Conversation

Dinnerbone
Copy link
Contributor

@Dinnerbone Dinnerbone commented Jan 9, 2024

It comes out on the 17th hopefully, so opening this now to hopefully get an easy update. Will undraft on release,

Also sneakily includes a fix for a new version of cargo fmt that came out since the last time it was ran on this project.

Tests work on my machine (windows) but CI fails on Ubuntu for... unknown reasons. I don't think it's related to this PR.

@robtfm
Copy link
Collaborator

robtfm commented Jan 9, 2024

thanks! yeah i agree the ci failures are not related. i am not sure what's going on, will investigate properly for the next naga release.

@Dinnerbone Dinnerbone force-pushed the naga_0_19 branch 2 times, most recently from d44bfaa to 79a62d1 Compare January 17, 2024 20:31
@Dinnerbone Dinnerbone marked this pull request as ready for review January 17, 2024 20:31
@Dinnerbone
Copy link
Contributor Author

PR is now up to date with 0.19

Locally I experienced a test failure but I can't get it to happen again. Hard to say if it's naga, naga_oil or something else at fault.

    Finished test [unoptimized + debuginfo] target(s) in 11.13s
     Running unittests src\lib.rs (target\debug\deps\naga_oil-c856d2160869737b.exe)

running 48 tests
test compose::parse_imports::import_tokens ... ok
test compose::comment_strip_iter::comment_test ... ok
test compose::preprocess::test::process_shader_def_else_ifdef_complicated_nesting ... ok
test compose::preprocess::test::process_shader_def_equal_int ... ok
test compose::preprocess::test::process_shader_def_replace ... ok
test compose::preprocess::test::process_shader_def_unknown_operator ... ok
test compose::preprocess::test::process_shader_def_equal_bool ... ok
test compose::preprocess::test::process_shader_def_else_ifdef_ends_up_in_third_clause ... ok
test compose::preprocess::test::process_shader_def_not_equal_bool ... ok
test compose::preprocess::test::process_shader_def_else_ifdef_no_match_and_no_fallback_else ... ok
test compose::preprocess::test::process_shader_def_else_ifndef ... ok
test compose::preprocess::test::process_shader_def_else_ifdef_only_accepts_one_valid_else_ifdef ... ok
test compose::preprocess::test::process_shader_def_else_ifdef_ends_up_in_first_clause ... ok
test compose::preprocess::test::process_shader_def_else_ifdef_ends_up_in_else ... ok
test compose::preprocess::test::process_shader_define_in_shader ... ok
test compose::test::test::apply_mod_override ... ok
test compose::test::test::glsl_wgsl_const_import ... ok
test compose::preprocess::test::process_shader_def_else_ifdef_ends_up_in_second_clause ... ok
test compose::test::test::err_parse ... ok
test compose::test::test::glsl_call_wgsl ... ok
test compose::preprocess::test::process_shader_def_else_if ... ok
test compose::test::test::duplicate_import ... ok
test compose::preprocess::test::process_shader_define_in_shader_with_value ... ok
test compose::test::test::basic_glsl ... ok
test compose::test::test::err_validation ... ok
test compose::test::test::conditional_import ... ok
test compose::test::test::bad_identifiers ... ok
test compose::test::test::dup_struct_import ... ok
test compose::test::test::import_in_decl ... ok
test compose::test::test::apply_override ... ok
test compose::test::test::glsl_const_import ... ok
test compose::test::test::big_shaderdefs ... ok
test compose::test::test::missing_import_in_shader ... ok
test compose::test::test::test_bevy_path_imports ... ok
test compose::test::test::item_sub_point ... ok
test compose::test::test::item_import_test ... ok
test compose::test::test::missing_import_in_module ... ok
test compose::test::test::use_shared_global ... ok
test compose::test::test::simple_compose ... ok
test compose::test::test::test_atomics ... ok
test compose::test::test::wgsl_glsl_const_import ... ok
test compose::test::test::invalid_override ... ok
test compose::test::test::wgsl_call_entrypoint ... ok
test compose::test::test::test_quoted_import_dup_name ... ok
test compose::test::test::wgsl_call_glsl ... ok
error: test failed, to rerun pass `--lib`

Caused by:
  process didn't exit successfully: `C:\Users\Dinnerbone\workspace\personal\naga_oil\target\debug\deps\naga_oil-c856d2160869737b.exe` (exit

 code: 0xc0000374, STATUS_HEAP_CORRUPTION)
note: test exited abnormally; to see the full output pass --nocapture to the harness.

@robtfm robtfm merged commit 31a1a61 into bevyengine:master Jan 17, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants