1 files changed, 11 insertions, 11 deletions

diff --git a/third_party/rust/wgpu-core/src/instance.rs b/third_party/rust/wgpu-core/src/instance.rs
index 582571c2b8..b909245fac 100644
--- a/third_party/rust/wgpu-core/src/instance.rs
+++ b/third_party/rust/wgpu-core/src/instance.rs
@@ -198,7 +198,7 @@ impl<A: HalApi> Adapter<A> {
 
         Self {
             raw,
-            info: ResourceInfo::new("<Adapter>"),
+            info: ResourceInfo::new("<Adapter>", None),
         }
     }
 
@@ -303,7 +303,7 @@ impl<A: HalApi> Adapter<A> {
             let queue = Queue {
                 device: None,
                 raw: Some(hal_device.queue),
-                info: ResourceInfo::new("<Queue>"),
+                info: ResourceInfo::new("<Queue>", None),
             };
             return Ok((device, queue));
         }
@@ -521,7 +521,7 @@ impl Global {
 
         let surface = Surface {
             presentation: Mutex::new(None),
-            info: ResourceInfo::new("<Surface>"),
+            info: ResourceInfo::new("<Surface>", None),
             raw: hal_surface,
         };
 
@@ -542,7 +542,7 @@ impl Global {
 
         let surface = Surface {
             presentation: Mutex::new(None),
-            info: ResourceInfo::new("<Surface>"),
+            info: ResourceInfo::new("<Surface>", None),
             raw: {
                 let hal_surface = self
                     .instance
@@ -575,7 +575,7 @@ impl Global {
 
         let surface = Surface {
             presentation: Mutex::new(None),
-            info: ResourceInfo::new("<Surface>"),
+            info: ResourceInfo::new("<Surface>", None),
             raw: {
                 let hal_surface = self
                     .instance
@@ -604,7 +604,7 @@ impl Global {
 
         let surface = Surface {
             presentation: Mutex::new(None),
-            info: ResourceInfo::new("<Surface>"),
+            info: ResourceInfo::new("<Surface>", None),
             raw: {
                 let hal_surface = self
                     .instance
@@ -633,7 +633,7 @@ impl Global {
 
         let surface = Surface {
             presentation: Mutex::new(None),
-            info: ResourceInfo::new("<Surface>"),
+            info: ResourceInfo::new("<Surface>", None),
             raw: {
                 let hal_surface = self
                     .instance
@@ -1072,10 +1072,10 @@ impl Global {
             let device = hub.devices.get(device_id).unwrap();
             queue.device = Some(device.clone());
 
-            let (queue_id, _) = queue_fid.assign(queue);
+            let (queue_id, queue) = queue_fid.assign(queue);
             resource_log!("Created Queue {:?}", queue_id);
 
-            device.queue_id.write().replace(queue_id);
+            device.set_queue(queue);
 
             return (device_id, queue_id, None);
         };
@@ -1124,10 +1124,10 @@ impl Global {
             let device = hub.devices.get(device_id).unwrap();
             queue.device = Some(device.clone());
 
-            let (queue_id, _) = queues_fid.assign(queue);
+            let (queue_id, queue) = queues_fid.assign(queue);
             resource_log!("Created Queue {:?}", queue_id);
 
-            device.queue_id.write().replace(queue_id);
+            device.set_queue(queue);
 
             return (device_id, queue_id, None);
         };