Update to spirv-std 0.6.0

Author: ProfLander

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 crate_type = ["dylib", "rlib"]
 
 [dependencies]
-bitflags = "1.3.2"
-spirv-std = { version = "0.5.0", features = ["glam"] }
+bitflags = "2.0.1"
+spirv-std = "0.6.0"
 permutate-macro = { git = "https://github.com/Bevy-Rust-GPU/permutate-macro", tag = "v0.4.0" }
-rust-gpu-bridge = { git = "https://github.com/Bevy-Rust-GPU/rust-gpu-bridge", tag = "v0.3.0", features = ["spirv-std"] }
+rust-gpu-bridge = { git = "https://github.com/Bevy-Rust-GPU/rust-gpu-bridge", branch = "master", features = ["spirv-std"] }

rust-toolchain

@@ -0,0 +1,7 @@
+[toolchain]
+channel = "nightly-2023-01-21"
+components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
+# commit_hash = 5ce39f42bd2c8bca9c570f0560ebe1fce4eddb14
+
+# Whenever changing the nightly channel, update the commit hash above, and make
+# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.

rust-toolchain.toml

@@ -78,10 +78,10 @@ impl EnvironmentMap for EnvironmentMapLight {
         let radiance_level =
             perceptual_roughness * (lights.environment_map_smallest_specular_mip_level) as f32;
         let irradiance = environment_map_diffuse
-            .sample::<f32, Vec4>(*environment_map_sampler, n)
+            .sample::<f32>(*environment_map_sampler, n)
             .truncate();
         let radiance = environment_map_specular
-            .sample_by_lod::<f32, Vec4>(*environment_map_sampler, r, radiance_level)
+            .sample_by_lod::<f32>(*environment_map_sampler, r, radiance_level)
             .truncate();
 
         // Multiscattering approximation: https://www.jcgt.org/published/0008/01/03/paper.pdf

src/environment_map.rs

@@ -56,11 +56,7 @@ impl Mesh {
         // Unreal Engine, Godot, and more all use the mikktspace method. Do not change this code
         // unless you really know what you are doing.
         // http://www.mikktspace.com/
-        (Mat3 {
-            x_axis: model.x_axis.truncate(),
-            y_axis: model.y_axis.truncate(),
-            z_axis: model.z_axis.truncate(),
-        } * vertex_tangent.truncate())
+        (Mat3::from_mat4(model) * vertex_tangent.truncate())
         .normalize()
         .extend(
             // NOTE: Multiplying by the sign of the determinant of the 3x3 model matrix accounts for

src/mesh/mod.rs

@@ -255,7 +255,7 @@ pub fn fragment(
     #[permutate(uv = some)]
     if (material.base.flags & STANDARD_MATERIAL_FLAGS_BASE_COLOR_TEXTURE_BIT) != 0 {
         *output_color =
-            *output_color * base_color_texture.sample::<f32, Vec4>(*base_color_sampler, *vertex_uv);
+            *output_color * base_color_texture.sample::<f32>(*base_color_sampler, *vertex_uv);
     }
 
     // NOTE: Unlit bit not set means == 0 is true, so the true case is if lit
@@ -277,7 +277,7 @@ pub fn fragment(
         {
             (emissive.truncate()
                 * emissive_texture
-                    .sample::<f32, Vec4>(*emissive_sampler, *vertex_uv)
+                    .sample::<f32>(*emissive_sampler, *vertex_uv)
                     .truncate())
             .extend(1.0)
         } else {
@@ -294,8 +294,8 @@ pub fn fragment(
 
         #[permutate(uv = some)]
         if (material.base.flags & STANDARD_MATERIAL_FLAGS_METALLIC_ROUGHNESS_TEXTURE_BIT) != 0 {
-            let metallic_roughness = metallic_roughness_texture
-                .sample::<f32, Vec4>(*metallic_roughness_sampler, *vertex_uv);
+            let metallic_roughness =
+                metallic_roughness_texture.sample::<f32>(*metallic_roughness_sampler, *vertex_uv);
             // Sampling from GLTF standard channels for now
             metallic = metallic * metallic_roughness.z;
             perceptual_roughness = perceptual_roughness * metallic_roughness.y;
@@ -310,7 +310,7 @@ pub fn fragment(
         #[permutate(uv = some)]
         if (material.base.flags & STANDARD_MATERIAL_FLAGS_OCCLUSION_TEXTURE_BIT) != 0 {
             occlusion = occlusion_texture
-                .sample::<f32, Vec4>(*occlusion_sampler, *vertex_uv)
+                .sample::<f32>(*occlusion_sampler, *vertex_uv)
                 .x;
         }
 
@@ -355,7 +355,7 @@ pub fn fragment(
 
                 // Nt is the tangent-space normal.
                 let mut nt = normal_map_texture
-                    .sample::<f32, Vec4>(*normal_map_sampler, *vertex_uv)
+                    .sample::<f32>(*normal_map_sampler, *vertex_uv)
                     .truncate();
                 if (material.base.flags & STANDARD_MATERIAL_FLAGS_TWO_COMPONENT_NORMAL_MAP) != 0 {
                     // Only use the xy components and derive z for 2-component normal maps.

src/pbr/entry_points.rs

@@ -22,7 +22,7 @@ pub enum TonemapMethodAgx {}
 impl SampleCurrentLut for TonemapMethodAgx {
     fn sample_current_lut(dt_lut_texture: &Texture3d, dt_lut_sampler: &Sampler, p: Vec3) -> Vec3 {
         dt_lut_texture
-            .sample_by_lod::<f32, Vec4>(*dt_lut_sampler, p, 0.0)
+            .sample_by_lod::<f32>(*dt_lut_sampler, p, 0.0)
             .truncate()
     }
 }
@@ -32,7 +32,7 @@ pub enum TonemapMethodTonyMcMapFace {}
 impl SampleCurrentLut for TonemapMethodTonyMcMapFace {
     fn sample_current_lut(dt_lut_texture: &Texture3d, dt_lut_sampler: &Sampler, p: Vec3) -> Vec3 {
         dt_lut_texture
-            .sample_by_lod::<f32, Vec4>(*dt_lut_sampler, p, 0.0)
+            .sample_by_lod::<f32>(*dt_lut_sampler, p, 0.0)
             .truncate()
     }
 }
@@ -42,7 +42,7 @@ pub enum TonemapMethodBlenderFilmic {}
 impl SampleCurrentLut for TonemapMethodBlenderFilmic {
     fn sample_current_lut(dt_lut_texture: &Texture3d, dt_lut_sampler: &Sampler, p: Vec3) -> Vec3 {
         dt_lut_texture
-            .sample_by_lod::<f32, Vec4>(*dt_lut_sampler, p, 0.0)
+            .sample_by_lod::<f32>(*dt_lut_sampler, p, 0.0)
             .truncate()
     }
 }