Merge pull request #363 from armansito/pr-shaders-zero-init-wg-mem

[shaders][msl] Enable `zero_initialize_workgroup_memory` setting [shaders] Enable CONTROL_FLOW_UNIFORMITY validation check
linebender · Sep 22, 2023 · e121dd4 · e121dd4
2 parents 530cde9 + ddabca8
commit e121dd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/crates/shaders/src/compile/mod.rs b/crates/shaders/src/compile/mod.rs
@@ -47,11 +47,8 @@ pub struct ShaderInfo {
 impl ShaderInfo {
     pub fn new(source: String, entry_point: &str) -> Result<ShaderInfo, Error> {
         let module = wgsl::parse_str(&source)?;
-        let module_info = naga::valid::Validator::new(
-            ValidationFlags::all() & !ValidationFlags::CONTROL_FLOW_UNIFORMITY,
-            Capabilities::all(),
-        )
-        .validate(&module)?;
+        let module_info = naga::valid::Validator::new(ValidationFlags::all(), Capabilities::all())
+            .validate(&module)?;
         let (entry_index, entry) = module
             .entry_points
             .iter()

diff --git a/crates/shaders/src/compile/msl.rs b/crates/shaders/src/compile/msl.rs
@@ -43,7 +43,7 @@ pub fn translate(shader: &ShaderInfo) -> Result<String, naga_msl::Error> {
         spirv_cross_compatibility: false,
         fake_missing_bindings: false,
         bounds_check_policies: naga::proc::BoundsCheckPolicies::default(),
-        zero_initialize_workgroup_memory: false,
+        zero_initialize_workgroup_memory: true,
     };
     let (source, _) = naga_msl::write_string(
         &shader.module,