From dd7f1735f3cc094302ab603687a7e12d80fae75c Mon Sep 17 00:00:00 2001
From: Mikko Lehtonen <scoopr@iki.fi>
Date: Wed, 18 Nov 2020 22:58:31 +0200
Subject: [PATCH] [rs] Update wgpu-core

Pass label to error id creation methods.
---
 wgpu/Cargo.toml            |  4 ++--
 wgpu/src/backend/direct.rs | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index e7ffe2a41f..67b177e0a7 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan", "gfx-backend-vulkan"]
 package = "wgpu-core"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "5e1226995c368f9b4cfde2da7f5d6c12d22e1bf2"
+rev = "19b4ec58ae4fb065dcbcf4825f5852b0d10520d0"
 features = ["raw-window-handle"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "5e1226995c368f9b4cfde2da7f5d6c12d22e1bf2"
+rev = "19b4ec58ae4fb065dcbcf4825f5852b0d10520d0"
 
 [dependencies]
 arrayvec = "0.5"
diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs
index 6f1916da0f..63fba37eb8 100644
--- a/wgpu/src/backend/direct.rs
+++ b/wgpu/src/backend/direct.rs
@@ -671,7 +671,7 @@ impl crate::Context for Context {
             }, PhantomData)
         )
             .map_err(|err| err.with_context(format!("In Device::create_bind_group_layout with label {:?}", desc.label)))
-        .unwrap_error_sink(&device.error_sink, || wgc::gfx_select!( device.id => global.bind_group_layout_error(PhantomData)))
+        .unwrap_error_sink(&device.error_sink, || wgc::gfx_select!( device.id => global.bind_group_layout_error(PhantomData, desc.label)))
     }
 
     fn device_create_bind_group(
@@ -730,7 +730,7 @@ impl crate::Context for Context {
         })
         .unwrap_error_sink(
             &device.error_sink,
-            || wgc::gfx_select!( device.id => global.bind_group_error(PhantomData)),
+            || wgc::gfx_select!( device.id => global.bind_group_error(PhantomData, desc.label)),
         )
     }
 
@@ -774,7 +774,7 @@ impl crate::Context for Context {
         })
         .unwrap_error_sink(
             &device.error_sink,
-            || wgc::gfx_select!( device.id => global.pipeline_layout_error(PhantomData)),
+            || wgc::gfx_select!( device.id => global.pipeline_layout_error(PhantomData, desc.label)),
         )
     }
 
@@ -846,8 +846,8 @@ impl crate::Context for Context {
                 desc.label
             ))
         })
-        .unwrap_error_sink(&device.error_sink, || {
-            let err = wgc::gfx_select!( device.id => global.render_pipeline_error(PhantomData));
+        .unwrap_error_sink(&device.error_sink,  || {
+            let err = wgc::gfx_select!( device.id => global.render_pipeline_error(PhantomData, desc.label));
             (err, 0u8)
         })
         .0
@@ -889,7 +889,7 @@ impl crate::Context for Context {
             ))
         })
         .unwrap_error_sink(&device.error_sink, || {
-            let err = wgc::gfx_select!( device.id => global.compute_pipeline_error(PhantomData));
+            let err = wgc::gfx_select!( device.id => global.compute_pipeline_error(PhantomData, desc.label));
             (err, 0u8)
         })
         .0
@@ -919,7 +919,7 @@ impl crate::Context for Context {
         })
         .unwrap_error_sink(
             &device.error_sink,
-            || wgc::gfx_select!( device.id => global.buffer_error(PhantomData)),
+            || wgc::gfx_select!( device.id => global.buffer_error(PhantomData, desc.label)),
         );
         Buffer {
             id: buffer_id,
@@ -954,7 +954,7 @@ impl crate::Context for Context {
         })
         .unwrap_error_sink(
             &device.error_sink,
-            || wgc::gfx_select!( device.id => global.texture_error(PhantomData)),
+            || wgc::gfx_select!( device.id => global.texture_error(PhantomData, desc.label)),
         );
         Texture {
             id: texture_id,
@@ -992,7 +992,7 @@ impl crate::Context for Context {
         })
         .unwrap_error_sink(
             &device.error_sink,
-            || wgc::gfx_select!( device.id => global.sampler_error(PhantomData)),
+            || wgc::gfx_select!( device.id => global.sampler_error(PhantomData, desc.label)),
         )
     }
 
@@ -1212,7 +1212,7 @@ impl crate::Context for Context {
         })
         .unwrap_error_sink(
             &texture.error_sink,
-            || wgc::gfx_select!( texture.id =>global.texture_view_error(PhantomData)),
+            || wgc::gfx_select!( texture.id =>global.texture_view_error(PhantomData, desc.label)),
         )
     }
 
@@ -1447,7 +1447,7 @@ impl crate::Context for Context {
             .map_err(|err| err.with_context("In a CommandEncoder".to_string()))
             .unwrap_error_sink(
                 &encoder.error_sink,
-                || wgc::gfx_select!( encoder.id => global.command_buffer_error(PhantomData)),
+                || wgc::gfx_select!( encoder.id => global.command_buffer_error(PhantomData, None)),
             )
     }