Merge #3610

3610: Update spirv-cross to version 0.23 r=kvark a=grovesNL Fixes #3389 (comment) Co-authored-by: Joshua Groves <[email protected]>
gfx-rs · Jan 21, 2021 · 2d454c7 · 2d454c7
2 parents 1e57154 + 5d3720f
commit 2d454c7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/src/auxil/auxil/Cargo.toml b/src/auxil/auxil/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 [dependencies]
 hal = { path = "../../hal", version = "0.6", package = "gfx-hal" }
 fxhash = "0.2.1"
-spirv_cross = { version = "0.22", optional = true }
+spirv_cross = { version = "0.23", optional = true }
 
 [lib]
 name = "gfx_auxil"
diff --git a/src/backend/dx11/Cargo.toml b/src/backend/dx11/Cargo.toml
@@ -27,7 +27,7 @@ bitflags = "1"
 libloading = "0.6"
 log = { version = "0.4" }
 smallvec = "1.0"
-spirv_cross = { version = "0.22", features = ["hlsl"] }
+spirv_cross = { version = "0.23", features = ["hlsl"] }
 thunderdome = "0.3"
 parking_lot = "0.11"
 winapi = { version = "0.3", features = ["basetsd","d3d11", "d3d11_1", "d3d11sdklayers", "d3dcommon","d3dcompiler","dxgi1_2","dxgi1_3","dxgi1_4", "dxgi1_5", "dxgiformat","dxgitype","handleapi","minwindef","synchapi","unknwnbase","winbase","windef","winerror","winnt","winuser"] }

diff --git a/src/backend/dx12/Cargo.toml b/src/backend/dx12/Cargo.toml
@@ -29,7 +29,7 @@ native = { package = "d3d12", version = "0.3", features = ["libloading"] }
 log = "0.4"
 parking_lot = "0.11"
 smallvec = "1"
-spirv_cross = { version = "0.22", features = ["hlsl"] }
+spirv_cross = { version = "0.23", features = ["hlsl"] }
 winapi = { version = "0.3", features = ["basetsd","d3d12","d3d12sdklayers","d3d12shader","d3dcommon","d3dcompiler","dxgi1_2","dxgi1_3","dxgi1_4","dxgi1_5","dxgi1_6","dxgidebug","dxgiformat","dxgitype","handleapi","minwindef","synchapi","unknwnbase","winbase","windef","winerror","winnt","winuser"] }
 raw-window-handle = "0.3"
 

diff --git a/src/backend/gl/Cargo.toml b/src/backend/gl/Cargo.toml
@@ -26,7 +26,7 @@ hal = { path = "../../hal", version = "0.6", package = "gfx-hal" }
 auxil = { path = "../../auxil/auxil", version = "0.5", package = "gfx-auxil", features = ["spirv_cross"] }
 glow = "0.7.1"
 parking_lot = "0.11"
-spirv_cross = { version = "0.22.2", features = ["glsl"]}
+spirv_cross = { version = "0.23", features = ["glsl"]}
 raw-window-handle = "0.3"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

diff --git a/src/backend/metal/Cargo.toml b/src/backend/metal/Cargo.toml
@@ -35,7 +35,7 @@ foreign-types = "0.3"
 objc = "0.2.5"
 block = "0.1"
 cocoa-foundation = "0.1"
-spirv_cross = { version = "0.22", features = ["msl"] }
+spirv_cross = { version = "0.23", features = ["msl"] }
 parking_lot = "0.11"
 storage-map = "0.3"
 raw-window-handle = "0.3"

diff --git a/src/backend/metal/src/device.rs b/src/backend/metal/src/device.rs
@@ -1130,6 +1130,7 @@ impl hal::device::Device<Backend> for Device {
                         buffer_id: index as _,
                         texture_id: !0,
                         sampler_id: !0,
+                        count: 0,
                     },
                 );
             }
@@ -1210,6 +1211,7 @@ impl hal::device::Device<Backend> for Device {
                                 } else {
                                     !0
                                 },
+                                count: 0,
                             };
                             counters.add(layout.content);
                             if layout.array_index == 0 {
@@ -1240,6 +1242,7 @@ impl hal::device::Device<Backend> for Device {
                                 buffer_id: if has_stage { counters.buffers } else { !0 },
                                 texture_id: !0,
                                 sampler_id: !0,
+                                count: 0,
                             },
                         );
                         if has_stage {
@@ -1324,7 +1327,7 @@ impl hal::device::Device<Backend> for Device {
             MTLLanguageVersion::V2_0 => msl::Version::V2_0,
             MTLLanguageVersion::V2_1 => msl::Version::V2_1,
             MTLLanguageVersion::V2_2 => msl::Version::V2_2,
-            MTLLanguageVersion::V2_3 => msl::Version::V2_2, //TODO: update this!
+            MTLLanguageVersion::V2_3 => msl::Version::V2_3,
         };
         shader_compiler_options.enable_point_size_builtin = false;
         shader_compiler_options.vertex.invert_y = !self.features.contains(hal::Features::NDC_Y_UP);
@@ -2081,6 +2084,7 @@ impl hal::device::Device<Backend> for Device {
                     } else {
                         !0
                     },
+                    count: 0,
                 };
                 let res_offset = res.buffer_id.min(res.texture_id).min(res.sampler_id);
                 bindings.insert(