[rs] Merge #537

537: Update wgpu with DepthComparison component and better shader validation r=cwfitzgerald a=kvark

Depends on https://github.com/gfx-rs/wgpu/pull/898

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>

wgpu/Cargo.toml

@@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan"]
 package = "wgpu-core"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "0bb6bb8647a652e82c795fdc27a282e131d7cba3"
+rev = "bba82724a84e22dd23cd341a06be6909a3511370"
 features = ["raw-window-handle"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "0bb6bb8647a652e82c795fdc27a282e131d7cba3"
+rev = "bba82724a84e22dd23cd341a06be6909a3511370"
 
 [dependencies]
 arrayvec = "0.5"

wgpu/examples/shadow/main.rs

@@ -548,7 +548,7 @@ impl framework::Example for Example {
                             visibility: wgpu::ShaderStage::FRAGMENT,
                             ty: wgpu::BindingType::SampledTexture {
                                 multisampled: false,
-                                component_type: wgpu::TextureComponentType::Float,
+                                component_type: wgpu::TextureComponentType::DepthComparison,
                                 dimension: wgpu::TextureViewDimension::D2Array,
                             },
                             count: None,

wgpu/src/backend/web.rs

@@ -331,6 +331,9 @@ fn map_texture_component_type(
         wgt::TextureComponentType::Float => web_sys::GpuTextureComponentType::Float,
         wgt::TextureComponentType::Sint => web_sys::GpuTextureComponentType::Sint,
         wgt::TextureComponentType::Uint => web_sys::GpuTextureComponentType::Uint,
+        wgt::TextureComponentType::DepthComparison => {
+            panic!("depth-comparison is not supported here yet")
+        }
     }
 }
 

wgpu/src/macros.rs

@@ -47,6 +47,9 @@ fn test_vertex_attr_array() {
 #[macro_export]
 macro_rules! include_spirv {
     ($($token:tt)*) => {
-        $crate::util::make_spirv(include_bytes!($($token)*))
+        {
+            log::info!("including '{}'", $($token)*);
+            $crate::util::make_spirv(include_bytes!($($token)*))
+        }
     };
 }