refactor: add and use SampleCount::no_multisampling ctor.

gfx-rs · Jul 5, 2024 · 9c4be58 · 9c4be58
1 parent 46f1943
commit 9c4be58
Show file tree

Hide file tree

Showing 47 changed files with 76 additions and 71 deletions.
diff --git a/benches/benches/renderpass.rs b/benches/benches/renderpass.rs
@@ -85,7 +85,7 @@ impl RenderpassState {
                         depth_or_array_layers: 1,
                     },
                     mip_level_count: 1,
-                    sample_count: wgpu::SampleCount::new(1),
+                    sample_count: wgpu::SampleCount::no_multisampling(),
                     dimension: wgpu::TextureDimension::D2,
                     format: wgpu::TextureFormat::Rgba8UnormSrgb,
                     usage: wgpu::TextureUsages::TEXTURE_BINDING,
@@ -220,7 +220,7 @@ impl RenderpassState {
                     depth_or_array_layers: 1,
                 },
                 mip_level_count: 1,
-                sample_count: wgpu::SampleCount::new(1),
+                sample_count: wgpu::SampleCount::no_multisampling(),
                 dimension: wgpu::TextureDimension::D2,
                 format: wgpu::TextureFormat::Rgba8UnormSrgb,
                 usage: wgpu::TextureUsages::RENDER_ATTACHMENT,

diff --git a/examples/src/bunnymark/mod.rs b/examples/src/bunnymark/mod.rs
@@ -243,7 +243,7 @@ impl crate::framework::Example for Example {
                 label: None,
                 size,
                 mip_level_count: 1,
-                sample_count: SampleCount::new(1),
+                sample_count: SampleCount::no_multisampling(),
                 dimension: wgpu::TextureDimension::D2,
                 format: wgpu::TextureFormat::Rgba8UnormSrgb,
                 usage: wgpu::TextureUsages::COPY_DST | wgpu::TextureUsages::TEXTURE_BINDING,

diff --git a/examples/src/conservative_raster/mod.rs b/examples/src/conservative_raster/mod.rs
@@ -30,7 +30,7 @@ impl Example {
                     depth_or_array_layers: 1,
                 },
                 mip_level_count: 1,
-                sample_count: SampleCount::new(1),
+                sample_count: SampleCount::no_multisampling(),
                 dimension: wgpu::TextureDimension::D2,
                 format: RENDER_TARGET_FORMAT,
                 usage: wgpu::TextureUsages::TEXTURE_BINDING

diff --git a/examples/src/cube/mod.rs b/examples/src/cube/mod.rs
@@ -173,7 +173,7 @@ impl crate::framework::Example for Example {
             label: None,
             size: texture_extent,
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::R8Uint,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,

diff --git a/examples/src/framework.rs b/examples/src/framework.rs
@@ -555,7 +555,7 @@ impl<E: Example + wgpu::WasmNotSendSync> From<ExampleTestParams<E>>
                         depth_or_array_layers: 1,
                     },
                     mip_level_count: 1,
-                    sample_count: wgpu::SampleCount::new(1),
+                    sample_count: wgpu::SampleCount::no_multisampling(),
                     dimension: wgpu::TextureDimension::D2,
                     format,
                     usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::COPY_SRC,

diff --git a/examples/src/mipmap/mod.rs b/examples/src/mipmap/mod.rs
@@ -232,7 +232,7 @@ impl crate::framework::Example for Example {
         let texture = device.create_texture(&wgpu::TextureDescriptor {
             size: texture_extent,
             mip_level_count: MIP_LEVEL_COUNT,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: TEXTURE_FORMAT,
             usage: wgpu::TextureUsages::TEXTURE_BINDING

diff --git a/examples/src/msaa_line/mod.rs b/examples/src/msaa_line/mod.rs
@@ -233,7 +233,7 @@ impl crate::framework::Example for Example {
                 //       supported sample counts to the user.
                 Key::Named(NamedKey::ArrowLeft) => {
                     if self.sample_count == self.max_sample_count {
-                        self.sample_count = SampleCount::new(1);
+                        self.sample_count = SampleCount::no_multisampling();
                         self.rebuild_bundle = true;
                     }
                 }

diff --git a/examples/src/render_to_texture/mod.rs b/examples/src/render_to_texture/mod.rs
@@ -42,7 +42,7 @@ async fn run(_path: Option<String>) {
             depth_or_array_layers: 1,
         },
         mip_level_count: 1,
-        sample_count: SampleCount::new(1),
+        sample_count: SampleCount::no_multisampling(),
         dimension: wgpu::TextureDimension::D2,
         format: wgpu::TextureFormat::Rgba8UnormSrgb,
         usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::COPY_SRC,

diff --git a/examples/src/shadow/mod.rs b/examples/src/shadow/mod.rs
@@ -192,7 +192,7 @@ impl Example {
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: Self::DEPTH_FORMAT,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
@@ -381,7 +381,7 @@ impl crate::framework::Example for Example {
         let shadow_texture = device.create_texture(&wgpu::TextureDescriptor {
             size: Self::SHADOW_SIZE,
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: Self::SHADOW_FORMAT,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::TEXTURE_BINDING,

diff --git a/examples/src/skybox/mod.rs b/examples/src/skybox/mod.rs
@@ -77,7 +77,7 @@ impl Example {
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: Self::DEPTH_FORMAT,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
@@ -332,7 +332,7 @@ impl crate::framework::Example for Example {
             &wgpu::TextureDescriptor {
                 size,
                 mip_level_count: header.level_count,
-                sample_count: SampleCount::new(1),
+                sample_count: SampleCount::no_multisampling(),
                 dimension: wgpu::TextureDimension::D2,
                 format: skybox_format,
                 usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,

diff --git a/examples/src/stencil_triangles/mod.rs b/examples/src/stencil_triangles/mod.rs
@@ -154,7 +154,7 @@ impl crate::framework::Example for Example {
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Stencil8,
             view_formats: &[],
@@ -189,7 +189,7 @@ impl crate::framework::Example for Example {
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Stencil8,
             view_formats: &[],

diff --git a/examples/src/storage_texture/mod.rs b/examples/src/storage_texture/mod.rs
@@ -56,7 +56,7 @@ async fn run(_path: Option<String>) {
             depth_or_array_layers: 1,
         },
         mip_level_count: 1,
-        sample_count: SampleCount::new(1),
+        sample_count: SampleCount::no_multisampling(),
         dimension: wgpu::TextureDimension::D2,
         format: wgpu::TextureFormat::Rgba8Unorm,
         usage: wgpu::TextureUsages::STORAGE_BINDING | wgpu::TextureUsages::COPY_SRC,

diff --git a/examples/src/texture_arrays/mod.rs b/examples/src/texture_arrays/mod.rs
@@ -156,7 +156,7 @@ impl crate::framework::Example for Example {
         let texture_descriptor = wgpu::TextureDescriptor {
             size: wgpu::Extent3d::default(),
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8UnormSrgb,
             usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,

diff --git a/examples/src/timestamp_queries/mod.rs b/examples/src/timestamp_queries/mod.rs
@@ -377,7 +377,7 @@ fn render_pass(
             depth_or_array_layers: 1,
         },
         mip_level_count: 1,
-        sample_count: SampleCount::new(1),
+        sample_count: SampleCount::no_multisampling(),
         dimension: wgpu::TextureDimension::D2,
         format,
         usage: wgpu::TextureUsages::RENDER_ATTACHMENT,

diff --git a/examples/src/water/mod.rs b/examples/src/water/mod.rs
@@ -188,7 +188,7 @@ impl Example {
             label: Some("Reflection Render Texture"),
             size: texture_extent,
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: config.view_formats[0],
             usage: wgpu::TextureUsages::TEXTURE_BINDING
@@ -201,7 +201,7 @@ impl Example {
             label: Some("Depth Buffer"),
             size: texture_extent,
             mip_level_count: 1,
-            sample_count: SampleCount::new(1),
+            sample_count: SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth32Float,
             usage: wgpu::TextureUsages::TEXTURE_BINDING
@@ -626,7 +626,7 @@ impl crate::framework::Example for Example {
                         depth_read_only: false,
                         stencil_read_only: true,
                     }),
-                    sample_count: SampleCount::new(1),
+                    sample_count: SampleCount::no_multisampling(),
                     multiview: None,
                 });
             encoder.set_pipeline(&terrain_pipeline);

diff --git a/tests/tests/bgra8unorm_storage.rs b/tests/tests/bgra8unorm_storage.rs
@@ -33,7 +33,7 @@ static BGRA8_UNORM_STORAGE: GpuTestConfiguration = GpuTestConfiguration::new()
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Bgra8Unorm,
             usage: wgpu::TextureUsages::STORAGE_BINDING | wgpu::TextureUsages::COPY_SRC,

diff --git a/tests/tests/clear_texture.rs b/tests/tests/clear_texture.rs
@@ -232,7 +232,7 @@ async fn single_texture_clear_test(
             // arbitrary value between 2 and max
             3
         },
-        sample_count: wgpu::SampleCount::new(1), // multisampling is not supported for clear
+        sample_count: wgpu::SampleCount::no_multisampling(), // multisampling is not supported for clear
         dimension,
         format,
         usage: wgpu::TextureUsages::COPY_SRC | extra_usages,

diff --git a/tests/tests/device.rs b/tests/tests/device.rs
@@ -172,7 +172,7 @@ static DEVICE_DESTROY_THEN_MORE: GpuTestConfiguration = GpuTestConfiguration::ne
             label: None,
             size: texture_extent,
             mip_level_count: 2,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rg8Uint,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
@@ -184,7 +184,7 @@ static DEVICE_DESTROY_THEN_MORE: GpuTestConfiguration = GpuTestConfiguration::ne
             label: None,
             size: texture_extent,
             mip_level_count: 2,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rg8Uint,
             usage: wgpu::TextureUsages::COPY_SRC,
@@ -195,7 +195,7 @@ static DEVICE_DESTROY_THEN_MORE: GpuTestConfiguration = GpuTestConfiguration::ne
             label: None,
             size: texture_extent,
             mip_level_count: 2,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rg8Uint,
             usage: wgpu::TextureUsages::COPY_DST,
@@ -333,7 +333,7 @@ static DEVICE_DESTROY_THEN_MORE: GpuTestConfiguration = GpuTestConfiguration::ne
                         depth_or_array_layers: 1,
                     },
                     mip_level_count: 2,
-                    sample_count: wgpu::SampleCount::new(1),
+                    sample_count: wgpu::SampleCount::no_multisampling(),
                     dimension: wgpu::TextureDimension::D2,
                     format: wgpu::TextureFormat::Rg8Uint,
                     usage: wgpu::TextureUsages::COPY_SRC,
@@ -804,7 +804,7 @@ static DIFFERENT_BGL_ORDER_BW_SHADER_AND_API: GpuTestConfiguration = GpuTestConf
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgt::TextureDimension::D2,
             format: wgt::TextureFormat::Rgba8Unorm,
             usage: wgt::TextureUsages::RENDER_ATTACHMENT | wgt::TextureUsages::TEXTURE_BINDING,
@@ -903,7 +903,7 @@ static DEVICE_DESTROY_THEN_BUFFER_CLEANUP: GpuTestConfiguration = GpuTestConfigu
             label: None,
             size: texture_extent,
             mip_level_count: 2,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rg8Uint,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,

diff --git a/tests/tests/encoder.rs b/tests/tests/encoder.rs
@@ -41,7 +41,7 @@ static DROP_ENCODER_AFTER_ERROR: GpuTestConfiguration = GpuTestConfiguration::ne
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::R8Unorm,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
@@ -110,7 +110,7 @@ fn encoder_operations_fail_while_pass_alive(ctx: TestingContext) {
             depth_or_array_layers: 1,
         },
         mip_level_count: 1,
-        sample_count: wgpu::SampleCount::new(1),
+        sample_count: wgpu::SampleCount::no_multisampling(),
         dimension: wgpu::TextureDimension::D2,
         format: wgpu::TextureFormat::Rgba8Unorm,
         usage: wgpu::TextureUsages::COPY_DST,
@@ -135,7 +135,7 @@ fn encoder_operations_fail_while_pass_alive(ctx: TestingContext) {
             depth_or_array_layers: 1,
         },
         mip_level_count: 1,
-        sample_count: wgpu::SampleCount::new(1),
+        sample_count: wgpu::SampleCount::no_multisampling(),
         dimension: wgpu::TextureDimension::D2,
         format: wgpu::TextureFormat::Bgra8UnormSrgb,
         usage: wgpu::TextureUsages::RENDER_ATTACHMENT,

diff --git a/tests/tests/external_texture.rs b/tests/tests/external_texture.rs
@@ -255,7 +255,7 @@ static IMAGE_BITMAP_IMPORT: GpuTestConfiguration =
                         depth_or_array_layers: dest_layers,
                     },
                     mip_level_count: 1,
-                    sample_count: wgpu::SampleCount::new(1),
+                    sample_count: wgpu::SampleCount::no_multisampling(),
                     dimension: wgpu::TextureDimension::D2,
                     format: wgpu::TextureFormat::Rgba8UnormSrgb,
                     usage: wgpu::TextureUsages::RENDER_ATTACHMENT

diff --git a/tests/tests/float32_filterable.rs b/tests/tests/float32_filterable.rs
@@ -11,7 +11,7 @@ fn create_texture_binding(device: &wgpu::Device, format: wgpu::TextureFormat, fi
             depth_or_array_layers: 1,
         },
         mip_level_count: 1,
-        sample_count: wgpu::SampleCount::new(1),
+        sample_count: wgpu::SampleCount::no_multisampling(),
         dimension: wgpu::TextureDimension::D2,
         format,
         usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,

diff --git a/tests/tests/life_cycle.rs b/tests/tests/life_cycle.rs
@@ -88,7 +88,7 @@ static TEXTURE_DESTROY: GpuTestConfiguration =
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1), // multisampling is not supported for clear
+            sample_count: wgpu::SampleCount::no_multisampling(), // multisampling is not supported for clear
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8Snorm,
             usage: wgpu::TextureUsages::COPY_DST | wgpu::TextureUsages::TEXTURE_BINDING,

diff --git a/tests/tests/mem_leaks.rs b/tests/tests/mem_leaks.rs
@@ -145,7 +145,7 @@ async fn draw_test_with_reports(
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba8Unorm,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::COPY_DST,

diff --git a/tests/tests/nv12_texture/mod.rs b/tests/tests/nv12_texture/mod.rs
@@ -51,7 +51,7 @@ static NV12_TEXTURE_CREATION_SAMPLING: GpuTestConfiguration = GpuTestConfigurati
             format: wgpu::TextureFormat::NV12,
             usage: wgpu::TextureUsages::TEXTURE_BINDING,
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             view_formats: &[],
         });
         let y_view = tex.create_view(&wgpu::TextureViewDescriptor {
@@ -92,7 +92,7 @@ static NV12_TEXTURE_CREATION_SAMPLING: GpuTestConfiguration = GpuTestConfigurati
             label: None,
             size,
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: target_format,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
@@ -138,7 +138,7 @@ static NV12_TEXTURE_VIEW_PLANE_ON_NON_PLANAR_FORMAT: GpuTestConfiguration =
                 format: wgpu::TextureFormat::R8Unorm,
                 usage: wgpu::TextureUsages::TEXTURE_BINDING,
                 mip_level_count: 1,
-                sample_count: wgpu::SampleCount::new(1),
+                sample_count: wgpu::SampleCount::no_multisampling(),
                 view_formats: &[],
             });
             fail(
@@ -169,7 +169,7 @@ static NV12_TEXTURE_VIEW_PLANE_OUT_OF_BOUNDS: GpuTestConfiguration = GpuTestConf
             format: wgpu::TextureFormat::NV12,
             usage: wgpu::TextureUsages::TEXTURE_BINDING,
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             view_formats: &[],
         });
         fail(
@@ -201,7 +201,7 @@ static NV12_TEXTURE_BAD_FORMAT_VIEW_PLANE: GpuTestConfiguration = GpuTestConfigu
             format: wgpu::TextureFormat::NV12,
             usage: wgpu::TextureUsages::TEXTURE_BINDING,
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             view_formats: &[],
         });
         fail(
@@ -237,7 +237,7 @@ static NV12_TEXTURE_BAD_SIZE: GpuTestConfiguration = GpuTestConfiguration::new()
                     format: wgpu::TextureFormat::NV12,
                     usage: wgpu::TextureUsages::TEXTURE_BINDING,
                     mip_level_count: 1,
-                    sample_count: wgpu::SampleCount::new(1),
+                    sample_count: wgpu::SampleCount::no_multisampling(),
                     view_formats: &[],
                 });
             },

diff --git a/tests/tests/occlusion_query/mod.rs b/tests/tests/occlusion_query/mod.rs
@@ -14,7 +14,7 @@ static OCCLUSION_QUERY: GpuTestConfiguration = GpuTestConfiguration::new()
                 depth_or_array_layers: 1,
             },
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth32Float,
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,

diff --git a/tests/tests/partially_bounded_arrays/mod.rs b/tests/tests/partially_bounded_arrays/mod.rs
@@ -26,7 +26,7 @@ static PARTIALLY_BOUNDED_ARRAY: GpuTestConfiguration = GpuTestConfiguration::new
             label: None,
             size: texture_extent,
             mip_level_count: 1,
-            sample_count: wgpu::SampleCount::new(1),
+            sample_count: wgpu::SampleCount::no_multisampling(),
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Rgba32Float,
             usage: wgpu::TextureUsages::TEXTURE_BINDING