From 9259d2e51ddc1ca977f47c223ff89e38b6412a99 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Fri, 5 Jun 2020 10:15:59 -0400 Subject: [PATCH] Update to wgpu with shader validation --- Cargo.toml | 4 ++-- examples/capture/main.rs | 1 + examples/cube/main.rs | 3 --- examples/framework.rs | 1 + examples/hello-compute/main.rs | 1 + examples/hello-triangle/main.rs | 1 + examples/mipmap/main.rs | 6 ------ examples/shadow/main.rs | 2 -- examples/skybox/main.rs | 3 --- src/backend/direct.rs | 4 ++++ 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9a99b14a0c..04a6a3ca59 100644 --- a/Cargo.toml +++ b/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 = "041db60f9080769b5edc40888cf9683ccb255399" +rev = "eaf8f4af87237373105b016832662e7943b3899c" features = ["raw-window-handle"] [dependencies.wgt] package = "wgpu-types" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "041db60f9080769b5edc40888cf9683ccb255399" +rev = "eaf8f4af87237373105b016832662e7943b3899c" [dependencies] arrayvec = "0.5" diff --git a/examples/capture/main.rs b/examples/capture/main.rs index 9aa7d20a50..f71318d841 100644 --- a/examples/capture/main.rs +++ b/examples/capture/main.rs @@ -24,6 +24,7 @@ async fn run() { &wgpu::DeviceDescriptor { extensions: wgpu::Extensions::empty(), limits: wgpu::Limits::default(), + shader_validation: true, }, None, ) diff --git a/examples/cube/main.rs b/examples/cube/main.rs index 14c05ed619..ed0f619f5d 100644 --- a/examples/cube/main.rs +++ b/examples/cube/main.rs @@ -202,9 +202,6 @@ impl framework::Example for Example { mag_filter: wgpu::FilterMode::Nearest, min_filter: wgpu::FilterMode::Linear, mipmap_filter: wgpu::FilterMode::Nearest, - lod_min_clamp: 0.0, - lod_max_clamp: 100.0, - compare: None, ..Default::default() }); let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32); diff --git a/examples/framework.rs b/examples/framework.rs index bb67212c31..ea38240d59 100644 --- a/examples/framework.rs +++ b/examples/framework.rs @@ -78,6 +78,7 @@ async fn run_async(event_loop: EventLoop<()>, window: Window) { &wgpu::DeviceDescriptor { extensions: wgpu::Extensions::empty(), limits: wgpu::Limits::default(), + shader_validation: true, }, trace_dir.ok().as_ref().map(std::path::Path::new), ) diff --git a/examples/hello-compute/main.rs b/examples/hello-compute/main.rs index be821dd3bd..8ac05d474f 100644 --- a/examples/hello-compute/main.rs +++ b/examples/hello-compute/main.rs @@ -40,6 +40,7 @@ async fn execute_gpu(numbers: Vec) -> Vec { &wgpu::DeviceDescriptor { extensions: wgpu::Extensions::empty(), limits: wgpu::Limits::default(), + shader_validation: true, }, None, ) diff --git a/examples/hello-triangle/main.rs b/examples/hello-triangle/main.rs index d3b85d7a2c..58cd9d563f 100644 --- a/examples/hello-triangle/main.rs +++ b/examples/hello-triangle/main.rs @@ -25,6 +25,7 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu:: &wgpu::DeviceDescriptor { extensions: wgpu::Extensions::empty(), limits: wgpu::Limits::default(), + shader_validation: true, }, None, ) diff --git a/examples/mipmap/main.rs b/examples/mipmap/main.rs index ff7b6c66c5..7c03f92d8a 100644 --- a/examples/mipmap/main.rs +++ b/examples/mipmap/main.rs @@ -154,9 +154,6 @@ impl Example { mag_filter: wgpu::FilterMode::Linear, min_filter: wgpu::FilterMode::Nearest, mipmap_filter: wgpu::FilterMode::Nearest, - lod_min_clamp: 0.0, - lod_max_clamp: 100.0, - compare: None, ..Default::default() }); @@ -307,9 +304,6 @@ impl framework::Example for Example { mag_filter: wgpu::FilterMode::Linear, min_filter: wgpu::FilterMode::Linear, mipmap_filter: wgpu::FilterMode::Linear, - lod_min_clamp: 0.0, - lod_max_clamp: 100.0, - compare: None, ..Default::default() }); let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32); diff --git a/examples/shadow/main.rs b/examples/shadow/main.rs index b810cd0ef4..df11fd8b29 100644 --- a/examples/shadow/main.rs +++ b/examples/shadow/main.rs @@ -350,8 +350,6 @@ impl framework::Example for Example { mag_filter: wgpu::FilterMode::Linear, min_filter: wgpu::FilterMode::Linear, mipmap_filter: wgpu::FilterMode::Nearest, - lod_min_clamp: -100.0, - lod_max_clamp: 100.0, compare: Some(wgpu::CompareFunction::LessEqual), ..Default::default() }); diff --git a/examples/skybox/main.rs b/examples/skybox/main.rs index f49326f998..4532554dae 100644 --- a/examples/skybox/main.rs +++ b/examples/skybox/main.rs @@ -127,9 +127,6 @@ impl framework::Example for Skybox { mag_filter: wgpu::FilterMode::Nearest, min_filter: wgpu::FilterMode::Linear, mipmap_filter: wgpu::FilterMode::Nearest, - lod_min_clamp: 0.0, - lod_max_clamp: 100.0, - compare: None, ..Default::default() }); diff --git a/src/backend/direct.rs b/src/backend/direct.rs index 6bf4aa7ed2..1f28ffd6ef 100644 --- a/src/backend/direct.rs +++ b/src/backend/direct.rs @@ -351,6 +351,7 @@ impl crate::Context for Context { }, PhantomData )) + .unwrap() } fn device_create_bind_group( @@ -416,6 +417,7 @@ impl crate::Context for Context { }, PhantomData )) + .unwrap() } fn device_create_render_pipeline( @@ -485,6 +487,7 @@ impl crate::Context for Context { }, PhantomData )) + .unwrap() } fn device_create_compute_pipeline( @@ -507,6 +510,7 @@ impl crate::Context for Context { }, PhantomData )) + .unwrap() } fn device_create_buffer(