Cargo update (#674)

crates/rustc_codegen_spirv/Cargo.toml

@@ -29,15 +29,15 @@ use-compiled-tools = ["spirv-tools/use-compiled-tools"]
 [dependencies]
 # HACK(eddyb) these only exist to unify features across dependency trees,
 # in order to avoid multiple separate instances of `rustc_codegen_spirv`.
-hashbrown = { version = "0.9", features = ["default"] }
+hashbrown = { version = "0.11", features = ["default"] }
 libc = { version = "0.2", features = ["align", "extra_traits"] }
 num-traits = { version = "0.2", features = ["libm"] }
 syn = { version = "1", features = ["visit", "visit-mut"] }
 
 # Normal dependencies.
 bimap = "0.6"
 indexmap = "1.6.0"
-rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "4419db432d90cd333e62aae9669dd263acff0499" }
+rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "c2a11ba7961fa7c675800f50c1903f0e96c633f8" }
 rustc-demangle = "0.1.18"
 sanitize-filename = "0.3"
 serde = { version = "1.0", features = ["derive"] }
@@ -50,7 +50,7 @@ topological-sort = "0.1"
 [dev-dependencies]
 pipe = "0.4"
 pretty_assertions = "0.7"
-tempfile = "3.1"
+tempfile = "3.2"
 
 [package.metadata.rust-analyzer]
 # This crate uses #[feature(rustc_private)]

crates/spirv-builder/Cargo.toml

@@ -13,7 +13,7 @@ use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"]
 watch = ["notify"]
 
 [dependencies]
-memchr = "2.3"
+memchr = "2.4"
 raw-string = "0.3.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

crates/spirv-std/Cargo.toml

@@ -12,7 +12,7 @@ bitflags = "1.2.1"
 num-traits = { version = "0.2.14", default-features = false, features = ["libm"] }
 spirv-types = { path = "./shared", version = "0.4.0-alpha.9" }
 spirv-std-macros = { path = "./macros", version = "0.4.0-alpha.9" }
-glam = { version = "0.15.2", default-features = false, features = ["libm"], optional = true }
+glam = { version = "0.16.0", default-features = false, features = ["libm"], optional = true }
 
 [features]
 default = []

examples/runners/ash/Cargo.toml

@@ -15,7 +15,7 @@ use-compiled-tools = ["spirv-builder/use-compiled-tools"]
 [dependencies]
 ash = "0.32"
 ash-window = "0.6"
-winit = "0.24.0"
+winit = "0.25.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 structopt = "0.3.20"

examples/runners/wgpu/Cargo.toml

@@ -19,23 +19,23 @@ use-compiled-tools = ["spirv-builder/use-compiled-tools"]
 cfg-if = "1.0.0"
 shared = { path = "../../shaders/shared" }
 futures = { version = "0.3", default-features = false, features = ["std", "executor"] }
-wgpu = "0.7.0"
-winit = { version = "0.24", features = ["web-sys"] }
+wgpu = "0.8.1"
+winit = { version = "0.25.0", features = ["web-sys"] }
 clap = "3.0.0-beta.2"
-strum = { version = "0.20", default_features = false, features = ["derive"] }
+strum = { version = "0.21.0", default_features = false, features = ["derive"] }
 bytemuck = "1.6.3"
 
 [target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies]
 spirv-builder = { path = "../../../crates/spirv-builder", default-features = false, features = ["watch"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-ndk-glue = "0.2"
+ndk-glue = "0.3"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 wgpu-subscriber = "0.1.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-web-sys = "=0.3.46"
+web-sys = "=0.3.50"
 console_error_panic_hook = "0.1.6"
 console_log = "0.2.0"
 wasm-bindgen-futures = "0.4.18"

examples/runners/wgpu/src/compute.rs

@@ -33,7 +33,6 @@ pub async fn start_internal(
         .await
         .expect("Failed to find an appropriate adapter");
 
-    let timestamp_period = adapter.get_timestamp_period();
     let (device, queue) = adapter
         .request_device(
             &wgpu::DeviceDescriptor {
@@ -47,6 +46,9 @@ pub async fn start_internal(
         .expect("Failed to create device");
     drop(instance);
     drop(adapter);
+
+    let timestamp_period = queue.get_timestamp_period();
+
     // Load the shaders from disk
     let module = device.create_shader_module(&shader_binary);
 

examples/runners/wgpu/src/graphics.rs

@@ -160,8 +160,8 @@ async fn run(
                     {
                         let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
                             label: None,
-                            color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
-                                attachment: &frame.view,
+                            color_attachments: &[wgpu::RenderPassColorAttachment {
+                                view: &frame.view,
                                 resolve_target: None,
                                 ops: wgpu::Operations {
                                     load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
@@ -279,8 +279,10 @@ fn create_pipeline(
             topology: wgpu::PrimitiveTopology::TriangleList,
             strip_index_format: None,
             front_face: wgpu::FrontFace::Ccw,
-            cull_mode: wgpu::CullMode::None,
+            cull_mode: None,
+            clamp_depth: false,
             polygon_mode: wgpu::PolygonMode::Fill,
+            conservative: false,
         },
         depth_stencil: None,
         multisample: wgpu::MultisampleState {
@@ -293,8 +295,7 @@ fn create_pipeline(
             entry_point: shaders::main_fs,
             targets: &[wgpu::ColorTargetState {
                 format: swapchain_format,
-                alpha_blend: wgpu::BlendState::REPLACE,
-                color_blend: wgpu::BlendState::REPLACE,
+                blend: None,
                 write_mask: wgpu::ColorWrite::ALL,
             }],
         }),