[rs] Merge gfx-rs#345

345: Rustify the example's use of Extensions and SamplerDescriptor r=kvark a=cwfitzgerald Implements gfx-rs#696. This didn't change any content from gfx-rs#338, just interface, but I tested a couple examples and it seems to work okay. Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
kvark · Jun 3, 2020 · d8e8268 · d8e8268
2 parents 94c2626 + ed17f0a
commit d8e8268
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 31 deletions.
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -28,14 +28,14 @@ vulkan = ["wgc/gfx-backend-vulkan"]
 package = "wgpu-core"
 version = "0.5"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "9120f0399ce8d8cc48b0b87c26d58c71b2e925be"
+rev = "ac9587e9ced5b043abad68e260cb8c9e812cffb5"
 features = ["raw-window-handle"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 version = "0.5"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "9120f0399ce8d8cc48b0b87c26d58c71b2e925be"
+rev = "ac9587e9ced5b043abad68e260cb8c9e812cffb5"
 
 [dependencies]
 arrayvec = "0.5"

diff --git a/wgpu/examples/capture/main.rs b/wgpu/examples/capture/main.rs
@@ -19,9 +19,7 @@ async fn run() {
     let (device, queue) = adapter
         .request_device(
             &wgpu::DeviceDescriptor {
-                extensions: wgpu::Extensions {
-                    anisotropic_filtering: false,
-                },
+                extensions: wgpu::Extensions::empty(),
                 limits: wgpu::Limits::default(),
             },
             None,

diff --git a/wgpu/examples/cube/main.rs b/wgpu/examples/cube/main.rs
@@ -204,8 +204,8 @@ impl framework::Example for Example {
             mipmap_filter: wgpu::FilterMode::Nearest,
             lod_min_clamp: 0.0,
             lod_max_clamp: 100.0,
-            compare: wgpu::CompareFunction::Undefined,
-            anisotropy_clamp: 1,
+            compare: None,
+            anisotropy_clamp: None,
         });
         let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32);
         let mx_ref: &[f32; 16] = mx_total.as_ref();

diff --git a/wgpu/examples/framework.rs b/wgpu/examples/framework.rs
@@ -75,9 +75,7 @@ async fn run_async<E: Example>(event_loop: EventLoop<()>, window: Window) {
     let (device, queue) = adapter
         .request_device(
             &wgpu::DeviceDescriptor {
-                extensions: wgpu::Extensions {
-                    anisotropic_filtering: false,
-                },
+                extensions: wgpu::Extensions::empty(),
                 limits: wgpu::Limits::default(),
             },
             trace_dir.ok().as_ref().map(std::path::Path::new),

diff --git a/wgpu/examples/hello-compute/main.rs b/wgpu/examples/hello-compute/main.rs
@@ -37,9 +37,7 @@ async fn execute_gpu(numbers: Vec<u32>) -> Vec<u32> {
     let (device, queue) = adapter
         .request_device(
             &wgpu::DeviceDescriptor {
-                extensions: wgpu::Extensions {
-                    anisotropic_filtering: false,
-                },
+                extensions: wgpu::Extensions::empty(),
                 limits: wgpu::Limits::default(),
             },
             None,

diff --git a/wgpu/examples/hello-triangle/main.rs b/wgpu/examples/hello-triangle/main.rs
@@ -22,9 +22,7 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
     let (device, queue) = adapter
         .request_device(
             &wgpu::DeviceDescriptor {
-                extensions: wgpu::Extensions {
-                    anisotropic_filtering: false,
-                },
+                extensions: wgpu::Extensions::empty(),
                 limits: wgpu::Limits::default(),
             },
             None,

diff --git a/wgpu/examples/mipmap/main.rs b/wgpu/examples/mipmap/main.rs
@@ -156,8 +156,8 @@ impl Example {
             mipmap_filter: wgpu::FilterMode::Nearest,
             lod_min_clamp: 0.0,
             lod_max_clamp: 100.0,
-            compare: wgpu::CompareFunction::Undefined,
-            anisotropy_clamp: 1,
+            compare: None,
+            anisotropy_clamp: None,
         });
 
         let views = (0..mip_count)
@@ -309,8 +309,8 @@ impl framework::Example for Example {
             mipmap_filter: wgpu::FilterMode::Linear,
             lod_min_clamp: 0.0,
             lod_max_clamp: 100.0,
-            compare: wgpu::CompareFunction::Undefined,
-            anisotropy_clamp: 1,
+            compare: None,
+            anisotropy_clamp: None,
         });
         let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32);
         let mx_ref: &[f32; 16] = mx_total.as_ref();

diff --git a/wgpu/examples/shadow/main.rs b/wgpu/examples/shadow/main.rs
@@ -352,8 +352,8 @@ impl framework::Example for Example {
             mipmap_filter: wgpu::FilterMode::Nearest,
             lod_min_clamp: -100.0,
             lod_max_clamp: 100.0,
-            compare: wgpu::CompareFunction::LessEqual,
-            anisotropy_clamp: 1,
+            compare: Some(wgpu::CompareFunction::LessEqual),
+            anisotropy_clamp: None,
         });
 
         let shadow_texture = device.create_texture(&wgpu::TextureDescriptor {

diff --git a/wgpu/examples/skybox/main.rs b/wgpu/examples/skybox/main.rs
@@ -129,8 +129,8 @@ impl framework::Example for Skybox {
             mipmap_filter: wgpu::FilterMode::Nearest,
             lod_min_clamp: 0.0,
             lod_max_clamp: 100.0,
-            compare: wgpu::CompareFunction::Undefined,
-            anisotropy_clamp: 1,
+            compare: None,
+            anisotropy_clamp: None,
         });
 
         let paths: [&'static [u8]; 6] = [

diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs
@@ -703,9 +703,7 @@ impl crate::Context for Context {
 
     fn adapter_extensions(&self, _adapter: &Self::AdapterId) -> wgt::Extensions {
         // TODO: web-sys has no way of getting extensions on adapters
-        wgt::Extensions {
-            anisotropic_filtering: false,
-        }
+        wgt::Extensions::empty()
     }
 
     fn adapter_limits(&self, _adapter: &Self::AdapterId) -> wgt::Limits {
@@ -715,9 +713,7 @@ impl crate::Context for Context {
 
     fn device_extensions(&self, _device: &Self::DeviceId) -> wgt::Extensions {
         // TODO: web-sys has no way of getting extensions on devices
-        wgt::Extensions {
-            anisotropic_filtering: false,
-        }
+        wgt::Extensions::empty()
     }
 
     fn device_limits(&self, _device: &Self::DeviceId) -> wgt::Limits {
@@ -991,7 +987,7 @@ impl crate::Context for Context {
         mapped_desc.address_mode_u(map_address_mode(desc.address_mode_u));
         mapped_desc.address_mode_v(map_address_mode(desc.address_mode_v));
         mapped_desc.address_mode_w(map_address_mode(desc.address_mode_w));
-        if let Some(compare) = map_compare_function(desc.compare) {
+        if let Some(compare) = desc.compare.and_then(map_compare_function) {
             mapped_desc.compare(compare);
         }
         mapped_desc.lod_max_clamp(desc.lod_max_clamp);