Always build with vulkan 1.1

Author: DJMcNab

examples/runners/wgpu/builder/src/main.rs

@@ -2,7 +2,7 @@ use spirv_builder::SpirvBuilder;
 use std::error::Error;
 
 fn build_shader(path_to_create: &str) -> Result<(), Box<dyn Error>> {
-    SpirvBuilder::new(path_to_create, "spirv-unknown-vulkan1.0").build()?;
+    SpirvBuilder::new(path_to_create, "spirv-unknown-vulkan1.1").build()?;
     Ok(())
 }
 

examples/runners/wgpu/src/lib.rs

@@ -61,7 +61,7 @@ fn shader_module(shader: RustGPUShader) -> wgpu::ShaderModuleDescriptor<'static>
     {
         use spirv_builder::SpirvBuilder;
         use std::borrow::Cow;
-        use std::path::{Path, PathBuf};
+        use std::path::PathBuf;
         // Hack: spirv_builder builds into a custom directory if running under cargo, to not
         // deadlock, and the default target directory if not. However, packages like `proc-macro2`
         // have different configurations when being built here vs. when building
@@ -76,26 +76,12 @@ fn shader_module(shader: RustGPUShader) -> wgpu::ShaderModuleDescriptor<'static>
             RustGPUShader::Compute => "compute-shader",
             RustGPUShader::Mouse => "mouse-shader",
         };
-        let target = match shader {
-            RustGPUShader::Simplest | RustGPUShader::Mouse | RustGPUShader::Sky => {
-                "spirv-unknown-vulkan1.0"
-            }
-            // The compute example uses a StorageBuffer, so needs Vulkan 1.1 which supports
-            // that natively
-            RustGPUShader::Compute => "spirv-unknown-vulkan1.1",
-        };
         let manifest_dir = env!("CARGO_MANIFEST_DIR");
-        let crate_path = [
-            Path::new(manifest_dir),
-            Path::new(".."),
-            Path::new(".."),
-            Path::new("shaders"),
-            Path::new(crate_name),
-        ]
-        .iter()
-        .copied()
-        .collect::<PathBuf>();
-        let result = SpirvBuilder::new(crate_path, target)
+        let crate_path = [manifest_dir, "..", "..", "shaders", crate_name]
+            .iter()
+            .copied()
+            .collect::<PathBuf>();
+        let result = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.1")
             .print_metadata(false)
             .build()
             .unwrap();