github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation on wasm32-unknown-unknown without webgl feature (#2355)

Browse Source
This commit is contained in:
Jakob Hellermann
2022-01-04 17:09:48 +01:00
committed by GitHub
parent 75b885b0ca
commit bec6ec6235
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wgpu/src/backend/web.rs
View File

@@ -1272,21 +1272,25 @@ impl crate::Context for Context {
);
let spv_module_info = validator.validate(&spv_module).unwrap();
let wgsl_text = back::wgsl::write_string(&spv_module, &spv_module_info).unwrap();
let writer_flags = naga::back::wgsl::WriterFlags::empty();
let wgsl_text =
back::wgsl::write_string(&spv_module, &spv_module_info, writer_flags).unwrap();
web_sys::GpuShaderModuleDescriptor::new(wgsl_text.as_str())
}
#[cfg(feature = "glsl")]
ShaderSource::Glsl {
crate::ShaderSource::Glsl {
ref shader,
stage,
ref defines,
} => {
use naga::{back, front, valid};
// Parse the given shader code and store its representation.
let options = naga::front::glsl::Options {
let options = front::glsl::Options {
stage,
defines: defines.clone(),
};
let mut parser = naga::front::glsl::Parser::default();
let mut parser = front::glsl::Parser::default();
let glsl_module = parser.parse(&options, shader).unwrap();
let mut validator = valid::Validator::new(
@@ -1295,7 +1299,10 @@ impl crate::Context for Context {
);
let glsl_module_info = validator.validate(&glsl_module).unwrap();
let wgsl_text = back::wgsl::write_string(&glsl_module, &glsl_module_info).unwrap();
let writer_flags = naga::back::wgsl::WriterFlags::empty();
let wgsl_text =
back::wgsl::write_string(&glsl_module, &glsl_module_info, writer_flags)
.unwrap();
web_sys::GpuShaderModuleDescriptor::new(wgsl_text.as_str())
}
crate::ShaderSource::Wgsl(ref code) => web_sys::GpuShaderModuleDescriptor::new(code),