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

[naga] Update naga with new struct members separator #2538

Merged
merged 1 commit into from
Mar 17, 2022

Conversation

Gordon-F
Copy link
Contributor

Description
Update naga version with new struct members separator syntax (gfx-rs/naga#1773)

Testing
All updated examples tested on Windows with DX12 backend.

@Gordon-F
Copy link
Contributor Author

CI error looks unrelated with PR changes:

--- STDERR:                           wgpu::example/shadow shadow ---
error: XDG_RUNTIME_DIR not set in the environment.
[2022-03-13T11:27:04Z ERROR wgpu_hal::gles::egl] EGL 'eglInitialize' code 0x3001: DRI2: failed to load driver
thread 'shadow' panicked at 'UNEXPECTED TEST PASS: BACKEND', wgpu/examples/shadow/../../tests/common/mod.rs:294:9
stack backtrace:
   0: rust_begin_unwind
             at /rustc/53cb7b09b00cbea8754ffb78e7e3cb[521](https://github.com/gfx-rs/wgpu/runs/5527286574?check_suite_focus=true#step:13:521)cb8af4b/library/std/src/panicking.rs:493:5
   1: std::panicking::begin_panic_fmt
             at /rustc/53cb7b09b00cbea8754ffb78e7e3cb521cb8af4b/library/std/src/panicking.rs:435:5
   2: shadow::framework::test_common::initialize_test
             at ./examples/shadow/../../tests/common/mod.rs:294:9
   3: shadow::framework::test
             at ./examples/shadow/../framework.rs:458:5
   4: shadow::shadow
             at ./examples/shadow/main.rs:855:5
   5: shadow::shadow::{{closure}}
             at ./examples/shadow/main.rs:854:1
   6: core::ops::function::FnOnce::call_once
             at /rustc/53cb7b09b00cbea8754ffb78e7e3cb521cb8af4b/library/core/src/ops/function.rs:227:5
   7: core::ops::function::FnOnce::call_once
             at /rustc/53cb7b09b00cbea8754ffb78e7e3cb521cb8af4b/library/core/src/ops/function.rs:227:5
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

wgpu-hal/examples/halmark/shader.wgsl Outdated Show resolved Hide resolved
wgpu/examples/cube/shader.wgsl Outdated Show resolved Hide resolved
Copy link
Member

@kvark kvark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

@kvark kvark merged commit c5d5dbc into gfx-rs:master Mar 17, 2022
@Gordon-F Gordon-F deleted the wgsl_struct_comma branch March 17, 2022 07:28
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.

2 participants