Merge remote-tracking branch 'origin/master' into tracking-optimization

gfx-rs · May 16, 2022 · 740a182 · 740a182
2 parents 1bbff99 + b51fd85
commit 740a182
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -31,7 +31,8 @@ codespan-reporting = "0.11"
 copyless = "0.1"
 fxhash = "0.2"
 log = "0.4"
-parking_lot = "0.12"
+# parking_lot 0.12 switches from `winapi` to `windows`; permit either
+parking_lot = ">=0.11,<0.13"
 profiling = { version = "1", default-features = false }
 raw-window-handle = { version = "0.4", optional = true }
 ron = { version = "0.7", optional = true }

diff --git a/wgpu-core/src/command/bundle.rs b/wgpu-core/src/command/bundle.rs
@@ -282,7 +282,8 @@ impl RenderBundleEncoder {
                         .trackers
                         .render_pipelines
                         .extend(&*pipeline_guard, pipeline_id)
-                        .unwrap();
+                        .map_err(|_| RenderCommandError::InvalidPipeline(pipeline_id))
+                        .map_pass_err(scope)?;
 
                     self.context
                         .check_compatible(&pipeline.pass_context)

diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -31,7 +31,8 @@ required-features = ["gles"]
 
 [dependencies]
 bitflags = "1.0"
-parking_lot = "0.12"
+# parking_lot 0.12 switches from `winapi` to `windows`; permit either
+parking_lot = ">=0.11,<0.13"
 profiling = { version = "1", default-features = false }
 raw-window-handle = "0.4"
 thiserror = "1"

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -112,7 +112,8 @@ version = "0.12"
 [dependencies]
 arrayvec = "0.7"
 log = "0.4"
-parking_lot = "0.12"
+# parking_lot 0.12 switches from `winapi` to `windows`; permit either
+parking_lot = ">=0.11,<0.13"
 raw-window-handle = "0.4"
 serde = { version = "1", features = ["derive"], optional = true }
 smallvec = "1"
@@ -283,7 +284,8 @@ web-sys = { version = "0.3.53", features = [
 ]}
 js-sys = "0.3.50"
 wasm-bindgen-futures = "0.4.23"
-parking_lot = "0.12"
+# parking_lot 0.12 switches from `winapi` to `windows`; permit either
+parking_lot = ">=0.11,<0.13"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 console_error_panic_hook = "0.1.6"