From 4b7dac0e43eb78b6deaa77eb481030a5daa284b7 Mon Sep 17 00:00:00 2001 From: Joshua Groves Date: Fri, 9 Jul 2021 01:03:50 -0230 Subject: [PATCH] webgpu: pass wgsl directly --- wgpu/src/backend/web.rs | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs index ca124685ea..46f881f34a 100644 --- a/wgpu/src/backend/web.rs +++ b/wgpu/src/backend/web.rs @@ -1142,23 +1142,7 @@ impl crate::Context for Context { web_sys::GpuShaderModuleDescriptor::new(&js_sys::Uint32Array::from(&**spv)) } crate::ShaderSource::Wgsl(ref code) => { - use naga::{back::spv, front::wgsl, valid::Validator}; - let module = wgsl::parse_str(code).unwrap(); - let options = spv::Options { - lang_version: (1, 0), - flags: spv::WriterFlags::empty(), - capabilities: None, - index_bounds_check_policy: - naga::back::IndexBoundsCheckPolicy::UndefinedBehavior, - }; - let analysis = Validator::new( - naga::valid::ValidationFlags::empty(), - naga::valid::Capabilities::all(), - ) - .validate(&module) - .unwrap(); - let words = spv::write_vec(&module, &analysis, &options).unwrap(); - web_sys::GpuShaderModuleDescriptor::new(&js_sys::Uint32Array::from(&words[..])) + web_sys::GpuShaderModuleDescriptor::new(&js_sys::JsString::from(&**code)) } }; if let Some(ref label) = desc.label {