From 6994e72652a422f2f0930720f24f7dce6fa22018 Mon Sep 17 00:00:00 2001 From: Arman Uguray Date: Mon, 18 Sep 2023 18:40:22 -0700 Subject: [PATCH] [shaders] Enable CONTROL_FLOW_UNIFORMITY validation check The shaders all now pass the control flow uniformity validation check, so we don't need to keep it disabled. --- crates/shaders/src/compile/mod.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/shaders/src/compile/mod.rs b/crates/shaders/src/compile/mod.rs index 0a2dc5a0f..fca4a504a 100644 --- 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 { 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()