Use ShaderDefVal to avoid redundant code

bevyengine · Aug 10, 2023 · 478b48e · 478b48e
1 parent 06f7f96
commit 478b48e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 41 deletions.
diff --git a/crates/bevy_pbr/src/render/mesh_bindings.wgsl b/crates/bevy_pbr/src/render/mesh_bindings.wgsl
@@ -2,24 +2,13 @@
 
 #import bevy_pbr::mesh_types Mesh
 
-#ifdef MESH_BINDGROUP_1
-
 #ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-@group(1) @binding(0)
-var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
+
+    @group(#{MESH_BINDGROUP}) @binding(0)
+    var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
 #else
-@group(1) @binding(0)
-var<storage> mesh: array<Mesh>;
-#endif // PER_OBJECT_BUFFER_BATCH_SIZE
 
-#else // MESH_BINDGROUP_1
+    @group(#{MESH_BINDGROUP}) @binding(0)
+    var<storage> mesh: array<Mesh>;
 
-#ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-@group(2) @binding(0)
-var<uniform> mesh: array<Mesh, #{PER_OBJECT_BUFFER_BATCH_SIZE}u>;
-#else
-@group(2) @binding(0)
-var<storage> mesh: array<Mesh>;
 #endif // PER_OBJECT_BUFFER_BATCH_SIZE
-
-#endif // MESH_BINDGROUP_1
diff --git a/crates/bevy_pbr/src/render/morph.wgsl b/crates/bevy_pbr/src/render/morph.wgsl
@@ -11,23 +11,12 @@
 
 #import bevy_pbr::mesh_types MorphWeights
 
-#ifdef MESH_BINDGROUP_1
-
-@group(1) @binding(2)
+@group(#{MESH_BINDGROUP}) @binding(2)
 var<uniform> morph_weights: MorphWeights;
-@group(1) @binding(3)
-var morph_targets: texture_3d<f32>;
-
-#else
 
-@group(2) @binding(2)
-var<uniform> morph_weights: MorphWeights;
-@group(2) @binding(3)
+@group(#{MESH_BINDGROUP}) @binding(3)
 var morph_targets: texture_3d<f32>;
 
-#endif
-
-
 // NOTE: Those are the "hardcoded" values found in `MorphAttributes` struct
 // in crates/bevy_render/src/mesh/morph/visitors.rs
 // In an ideal world, the offsets are established dynamically and passed as #defines

diff --git a/crates/bevy_pbr/src/render/skinning.wgsl b/crates/bevy_pbr/src/render/skinning.wgsl
@@ -4,18 +4,8 @@
 
 #ifdef SKINNED
 
-#ifdef MESH_BINDGROUP_1
-
-    @group(1) @binding(1)
-    var<uniform> joint_matrices: SkinnedMesh;
-
-#else 
-
-    @group(2) @binding(1)
-    var<uniform> joint_matrices: SkinnedMesh;
-
-#endif
-
+@group(#{MESH_BINDGROUP}) @binding(1)
+var<uniform> joint_matrices: SkinnedMesh;
 
 fn skin_model(
     indexes: vec4<u32>,