From ed17f0abbbf105c8f1a2de721a6de2feaeacb52b Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Tue, 2 Jun 2020 20:15:15 -0400 Subject: [PATCH] [rs] Rustify the example's use of Extensions and SamplerDescriptor --- wgpu/Cargo.toml | 4 ++-- wgpu/examples/capture/main.rs | 4 +--- wgpu/examples/cube/main.rs | 4 ++-- wgpu/examples/framework.rs | 4 +--- wgpu/examples/hello-compute/main.rs | 4 +--- wgpu/examples/hello-triangle/main.rs | 4 +--- wgpu/examples/mipmap/main.rs | 8 ++++---- wgpu/examples/shadow/main.rs | 4 ++-- wgpu/examples/skybox/main.rs | 4 ++-- wgpu/src/backend/web.rs | 10 +++------- 10 files changed, 19 insertions(+), 31 deletions(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 9549c28a42..c1770f6745 100644 --- 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 index 6f06591d54..c6fdb097dd 100644 --- 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 index 26b8ceb75e..b6e7d8f969 100644 --- 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 index 0584526a79..9bc3a1f7bd 100644 --- a/wgpu/examples/framework.rs +++ b/wgpu/examples/framework.rs @@ -75,9 +75,7 @@ async fn run_async(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 index f2f2cdf2c8..cf0b16c0fc 100644 --- a/wgpu/examples/hello-compute/main.rs +++ b/wgpu/examples/hello-compute/main.rs @@ -37,9 +37,7 @@ async fn execute_gpu(numbers: Vec) -> Vec { 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 index f6b9a2461d..7186f4c8ec 100644 --- 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 index 4f602b665c..aacfab480f 100644 --- 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 index 49c20d6a18..2e2a698684 100644 --- 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 index 3ba6b4dee4..34ff85e4b0 100644 --- 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 index 17814aaa65..5fd322dce7 100644 --- 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);