diff --git a/Cargo.lock b/Cargo.lock index af786b5ec..78f12f3fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -465,7 +465,7 @@ dependencies = [ [[package]] name = "gfx-auxil" version = "0.8.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "fxhash", "gfx-hal", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx11" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "arrayvec", "bitflags", @@ -496,7 +496,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "arrayvec", "bit-set", @@ -517,7 +517,7 @@ dependencies = [ [[package]] name = "gfx-backend-empty" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "gfx-hal", "log", @@ -527,7 +527,7 @@ dependencies = [ [[package]] name = "gfx-backend-gl" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "arrayvec", "bitflags", @@ -550,7 +550,7 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "arrayvec", "bitflags", @@ -576,7 +576,7 @@ dependencies = [ [[package]] name = "gfx-backend-vulkan" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "arrayvec", "ash", @@ -596,7 +596,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" dependencies = [ "bitflags", "naga", @@ -917,7 +917,7 @@ dependencies = [ [[package]] name = "naga" version = "0.3.1" -source = "git+https://github.com/gfx-rs/naga?tag=gfx-22#9cd6fd9c205a57824644d0baedc6c15997be1e36" +source = "git+https://github.com/gfx-rs/naga?tag=gfx-23#4a5ff9a0538510ff3c3efa171941bfb44fc1be9c" dependencies = [ "bit-set", "bitflags", @@ -1172,7 +1172,7 @@ dependencies = [ [[package]] name = "range-alloc" version = "0.1.2" -source = "git+https://github.com/gfx-rs/gfx?rev=84e02f96149207b1bafecb1924b14315930c98ee#84e02f96149207b1bafecb1924b14315930c98ee" +source = "git+https://github.com/gfx-rs/gfx?rev=d3d533ce4a1d48799e660dd81ad4828f7b03a2f1#d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" [[package]] name = "raw-window-handle" diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 52403131c..971a5f771 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -40,28 +40,28 @@ thiserror = "1" gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc.git", rev = "2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6" } gpu-descriptor = { version = "0.1" } -hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee" } -gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee" } +hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" } +gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" } [target.'cfg(all(not(target_arch = "wasm32"), all(unix, not(target_os = "ios"), not(target_os = "macos"))))'.dependencies] -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee", features = ["naga"] } -gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee" } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1", features = ["naga"] } +gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" } [target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies] -gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee" } -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee", optional = true } +gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1", optional = true } [target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies] -gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee" } -gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee" } -gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee", features = ["naga"] } +gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" } +gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" } +gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1", features = ["naga"] } [target.'cfg(target_arch = "wasm32")'.dependencies] -gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "84e02f96149207b1bafecb1924b14315930c98ee" } +gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "d3d533ce4a1d48799e660dd81ad4828f7b03a2f1" } [dependencies.naga] git = "https://github.com/gfx-rs/naga" -tag = "gfx-22" +tag = "gfx-23" features = ["spv-in", "spv-out", "wgsl-in"] [dependencies.wgt] diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index 20851d32f..1e90af6cb 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -332,15 +332,8 @@ impl Device { //Note: we don't adjust the coordinate space, because `NDC_Y_UP` is required. spv::Options { lang_version: (1, 0), - capabilities: [ - spv::Capability::Shader, - spv::Capability::Matrix, - spv::Capability::Sampled1D, - spv::Capability::Image1D, - ] - .iter() - .cloned() - .collect(), + // doesn't matter, the preferred path is via a naga::Module + capabilities: None, flags, } }; @@ -999,6 +992,7 @@ impl Device { // Parse the given shader code and store its representation. let options = naga::front::spv::Options { adjust_coordinate_space: false, // we require NDC_Y_UP feature + strict_capabilities: true, flow_graph_dump_prefix: None, }; let parser = naga::front::spv::Parser::new(spv.iter().cloned(), &options);