Update PBR fragment parameters

Author: ProfLander

src/bevy_pbr_rust.rs

@@ -1,6 +1,6 @@
 //! `bevy-pbr-rust`-backed `RustGpuMaterial` implementation for `StandardMaterial`.
 
-use bevy::prelude::StandardMaterial;
+use bevy::{prelude::StandardMaterial, render::render_resource::ShaderDefVal};
 
 use crate::prelude::{EntryPoint, EntryPointName, EntryPointParameters, RustGpuMaterial};
 
@@ -31,15 +31,13 @@ impl EntryPoint for PbrFragment {
     const NAME: EntryPointName = "pbr::entry_points::fragment";
     const PARAMETERS: EntryPointParameters = &[
         (&[("NO_TEXTURE_ARRAYS_SUPPORT", "texture")], "array"),
-        (&[("NO_STORAGE_BUFFERS_SUPPORT", "uniform")], "storage"),
-        (&[("VERTEX_POSITIONS", "some")], "none"),
-        (&[("VERTEX_NORMALS", "some")], "none"),
         (&[("VERTEX_UVS", "some")], "none"),
         (&[("VERTEX_TANGENTS", "some")], "none"),
         (&[("VERTEX_COLORS", "some")], "none"),
         (&[("STANDARDMATERIAL_NORMAL_MAP", "some")], "none"),
         (&[("SKINNED", "some")], "none"),
         (&[("TONEMAP_IN_SHADER", "some")], "none"),
+        (&[("PREMULTIPLY_ALPHA", "some")], "none"),
         (&[("DEBAND_DITHER", "some")], "none"),
         (
             &[
@@ -56,11 +54,47 @@ impl EntryPoint for PbrFragment {
             "none",
         ),
     ];
+
+    fn permutation(shader_defs: &Vec<ShaderDefVal>) -> Vec<String> {
+        let mut permutation = vec![];
+
+        for (defined, undefined) in Self::PARAMETERS.iter() {
+            if let Some(mapping) = defined.iter().find_map(|(def, mapping)| {
+                if shader_defs.contains(&ShaderDefVal::Bool(def.to_string(), true)) {
+                    Some(mapping)
+                } else {
+                    None
+                }
+            }) {
+                permutation.push(mapping.to_string());
+            } else {
+                permutation.push(undefined.to_string())
+            };
+        }
+
+        if let Some(ge) = shader_defs.iter().find_map(|def| match def {
+            bevy::render::render_resource::ShaderDefVal::UInt(key, value) => {
+                if key.as_str() == "AVAILABLE_STORAGE_BUFFER_BINDINGS" {
+                    Some(*value >= 3)
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        }) {
+            if ge {
+                permutation.insert(1, "storage".to_string())
+            } else {
+                permutation.insert(1, "uniform".to_string())
+            }
+        }
+
+        permutation
+    }
 }
 
 /// `StandardMaterial` implementation
 impl RustGpuMaterial for StandardMaterial {
     type Vertex = MeshVertex;
     type Fragment = PbrFragment;
 }
-

src/rust_gpu.rs

@@ -297,8 +297,8 @@ where
         if let Some(vertex_shader) = key.bind_group_data.vertex_shader {
             info!("Vertex shader is present, aggregating defs");
 
-            info!("Building vertex entrypoint");
             let entry_point = M::Vertex::build(&descriptor.vertex.shader_defs);
+            info!("Built vertex entrypoint {entry_point:}");
 
             #[allow(unused_mut)]
             let mut apply = true;
@@ -355,8 +355,8 @@ where
             if let Some(fragment_shader) = key.bind_group_data.fragment_shader {
                 info!("Fragment shader is present, aggregating defs");
 
-                info!("Building fragment entrypoint");
                 let entry_point = M::Fragment::build(&fragment_descriptor.shader_defs);
+                info!("Built fragment entrypoint {entry_point:}");
 
                 #[allow(unused_mut)]
                 let mut apply = true;