remove backend from ID (#6263)

gfx-rs · Sep 13, 2024 · c8beade · c8beade
1 parent ff52b86
commit c8beade
Show file tree

Hide file tree

Showing 23 changed files with 280 additions and 542 deletions.
diff --git a/deno_webgpu/lib.rs b/deno_webgpu/lib.rs
@@ -401,10 +401,7 @@ pub fn op_webgpu_request_adapter(
         force_fallback_adapter,
         compatible_surface: None, // windowless
     };
-    let res = instance.request_adapter(
-        &descriptor,
-        wgpu_core::instance::AdapterInputs::Mask(backends, |_| None),
-    );
+    let res = instance.request_adapter(&descriptor, backends, None);
 
     let adapter = match res {
         Ok(adapter) => adapter,

diff --git a/player/src/bin/play.rs b/player/src/bin/play.rs
@@ -56,7 +56,7 @@ fn main() {
         global.instance_create_surface(
             window.display_handle().unwrap().into(),
             window.window_handle().unwrap().into(),
-            Some(wgc::id::Id::zip(0, 1, wgt::Backend::Empty)),
+            Some(wgc::id::Id::zip(0, 1)),
         )
     }
     .unwrap();
@@ -74,14 +74,15 @@ fn main() {
                         #[cfg(not(feature = "winit"))]
                         compatible_surface: None,
                     },
-                    wgc::instance::AdapterInputs::IdSet(&[wgc::id::AdapterId::zip(0, 0, backend)]),
+                    wgt::Backends::from(backend),
+                    Some(wgc::id::AdapterId::zip(0, 1)),
                 )
                 .expect("Unable to find an adapter for selected backend");
 
             let info = global.adapter_get_info(adapter);
             log::info!("Picked '{}'", info.name);
-            let device_id = wgc::id::Id::zip(1, 0, backend);
-            let queue_id = wgc::id::Id::zip(1, 0, backend);
+            let device_id = wgc::id::Id::zip(0, 1);
+            let queue_id = wgc::id::Id::zip(0, 1);
             let res = global.adapter_request_device(
                 adapter,
                 &desc,

diff --git a/player/src/lib.rs b/player/src/lib.rs
@@ -352,11 +352,7 @@ impl GlobalPlay for wgc::global::Global {
                 let (encoder, error) = self.device_create_command_encoder(
                     device,
                     &wgt::CommandEncoderDescriptor { label: None },
-                    Some(
-                        comb_manager
-                            .process(device.backend())
-                            .into_command_encoder_id(),
-                    ),
+                    Some(comb_manager.process().into_command_encoder_id()),
                 );
                 if let Some(e) = error {
                     panic!("{e}");

diff --git a/player/tests/data/bind-group.ron b/player/tests/data/bind-group.ron
@@ -2,13 +2,13 @@
     features: [],
     expectations: [], //not crash!
     actions: [
-        CreateBuffer(Id(0, 1, Empty), (
+        CreateBuffer(Id(0, 1), (
             label: None,
             size: 16,
             usage: 64,
             mapped_at_creation: false,
         )),
-        CreateBindGroupLayout(Id(0, 1, Empty), (
+        CreateBindGroupLayout(Id(0, 1), (
             label: None,
             entries: [
                 (
@@ -20,42 +20,42 @@
                 ),
             ],
         )),
-        CreateBindGroup(Id(0, 1, Empty), (
+        CreateBindGroup(Id(0, 1), (
             label: None,
-            layout: Id(0, 1, Empty),
+            layout: Id(0, 1),
             entries: [
                 (
                     binding: 0,
                     resource: Buffer((
-                        buffer_id: Id(0, 1, Empty),
+                        buffer_id: Id(0, 1),
                         offset: 0,
                         size: None,
                     )),
                 )
             ],
         )),
-        CreatePipelineLayout(Id(0, 1, Empty), (
+        CreatePipelineLayout(Id(0, 1), (
             label: Some("empty"),
             bind_group_layouts: [
-                Id(0, 1, Empty),
+                Id(0, 1),
             ],
             push_constant_ranges: [],
         )),
         CreateShaderModule(
-            id: Id(0, 1, Empty),
+            id: Id(0, 1),
             desc: (
                 label: None,
                 flags: (bits: 3),
             ),
             data: "empty.wgsl",
         ),
         CreateComputePipeline(
-            id: Id(0, 1, Empty),
+            id: Id(0, 1),
             desc: (
                 label: None,
-                layout: Some(Id(0, 1, Empty)),
+                layout: Some(Id(0, 1)),
                 stage: (
-                    module: Id(0, 1, Empty),
+                    module: Id(0, 1),
                     entry_point: None,
                     constants: {},
                     zero_initialize_workgroup_memory: true,
@@ -70,9 +70,9 @@
                         SetBindGroup(
                             index: 0,
                             num_dynamic_offsets: 0,
-                            bind_group_id: Some(Id(0, 1, Empty)),
+                            bind_group_id: Some(Id(0, 1)),
                         ),
-                        SetPipeline(Id(0, 1, Empty)),
+                        SetPipeline(Id(0, 1)),
                     ],
                     dynamic_offsets: [],
                     string_data: [],

diff --git a/player/tests/data/buffer-copy.ron b/player/tests/data/buffer-copy.ron
@@ -10,7 +10,7 @@
     ],
     actions: [
         CreateBuffer(
-            Id(0, 1, Empty),
+            Id(0, 1),
             (
                 label: Some("dummy"),
                 size: 16,
@@ -19,7 +19,7 @@
             ),
         ),
         WriteBuffer(
-            id: Id(0, 1, Empty),
+            id: Id(0, 1),
             data: "data1.bin",
             range: (
                 start: 0,

diff --git a/player/tests/data/clear-buffer-texture.ron b/player/tests/data/clear-buffer-texture.ron
@@ -20,7 +20,7 @@
         )
     ],
     actions: [
-        CreateTexture(Id(0, 1, Empty), (
+        CreateTexture(Id(0, 1), (
             label: Some("Output Texture"),
             size: (
                 width: 64,
@@ -36,7 +36,7 @@
         // First fill the texture to ensure it wasn't just zero initialized or "happened" to be zero.
         WriteTexture(
             to: (
-                texture: Id(0, 1, Empty),
+                texture: Id(0, 1),
                 mip_level: 0,
                 array_layer: 0,
             ),
@@ -52,7 +52,7 @@
             ),
         ),
         CreateBuffer(
-            Id(0, 1, Empty),
+            Id(0, 1),
             (
                 label: Some("Output Buffer"),
                 size: 16384,
@@ -62,7 +62,7 @@
         ),
 
         CreateBuffer(
-            Id(1, 1, Empty),
+            Id(1, 1),
             (
                 label: Some("Buffer to be cleared"),
                 size: 16,
@@ -72,7 +72,7 @@
         ),
         // Make sure there is something in the buffer, otherwise it might be just zero init!
         WriteBuffer(
-            id: Id(1, 1, Empty),
+            id: Id(1, 1),
             data: "data1.bin",
             range: (
                 start: 0,
@@ -82,7 +82,7 @@
         ),
         Submit(1, [
             ClearTexture(
-                dst: Id(0, 1, Empty),
+                dst: Id(0, 1),
                 subresource_range: ImageSubresourceRange(
                     aspect: all,
                     baseMipLevel: 0,
@@ -93,12 +93,12 @@
             ),
             CopyTextureToBuffer(
                 src: (
-                    texture: Id(0, 1, Empty),
+                    texture: Id(0, 1),
                     mip_level: 0,
                     array_layer: 0,
                 ),
                 dst:  (
-                    buffer: Id(0, 1, Empty),
+                    buffer: Id(0, 1),
                     layout: (
                         offset: 0,
                         bytes_per_row: Some(256),
@@ -112,7 +112,7 @@
             ),
             // Partial clear to prove
             ClearBuffer(
-                dst: Id(1, 1, Empty),
+                dst: Id(1, 1),
                 offset: 4,
                 size: Some(8),
             )

diff --git a/player/tests/data/pipeline-statistics-query.ron b/player/tests/data/pipeline-statistics-query.ron
@@ -9,26 +9,26 @@
         ),
     ],
     actions: [
-        CreatePipelineLayout(Id(0, 1, Empty), (
+        CreatePipelineLayout(Id(0, 1), (
             label: Some("empty"),
             bind_group_layouts: [],
             push_constant_ranges: [],
         )),
         CreateShaderModule(
-            id: Id(0, 1, Empty),
+            id: Id(0, 1),
             desc: (
                 label: None,
                 flags: (bits: 3),
             ),
             data: "empty.wgsl",
         ),
         CreateComputePipeline(
-            id: Id(0, 1, Empty),
+            id: Id(0, 1),
             desc: (
                 label: None,
-                layout: Some(Id(0, 1, Empty)),
+                layout: Some(Id(0, 1)),
                 stage: (
-                    module: Id(0, 1, Empty),
+                    module: Id(0, 1),
                     entry_point: None,
                     constants: {},
                     zero_initialize_workgroup_memory: true,
@@ -37,15 +37,15 @@
             ),
         ),
         CreateQuerySet(
-            id: Id(0, 1, Empty),
+            id: Id(0, 1),
             desc: (
                 label: Some("Compute Invocation QuerySet"),
                 count: 2,
                 ty: PipelineStatistics(0x18), // FRAGMENT_SHADER_INVOCATIONS | COMPUTE_SHADER_INVOCATIONS
             ),
         ),
         CreateBuffer(
-            Id(0, 1, Empty),
+            Id(0, 1),
             (
                 label: Some("Compute Invocation Result Buffer"),
                 size: 16,
@@ -57,9 +57,9 @@
             RunComputePass(
                 base: (
                     commands: [
-                        SetPipeline(Id(0, 1, Empty)),
+                        SetPipeline(Id(0, 1)),
                         BeginPipelineStatisticsQuery(
-                            query_set_id: Id(0, 1, Empty),
+                            query_set_id: Id(0, 1),
                             query_index: 0,
                         ),
                         Dispatch((2, 3, 7,)),
@@ -71,10 +71,10 @@
                 ),
             ),
             ResolveQuerySet(
-                query_set_id: Id(0, 1, Empty),
+                query_set_id: Id(0, 1),
                 start_query: 0,
                 query_count: 1,
-                destination: Id(0, 1, Empty),
+                destination: Id(0, 1),
                 destination_offset: 0,
             )
         ]),