Skip to content

Commit 092917e

Browse files
jakobhellermannkvark
authored andcommitted
fix compilation on wasm32-unknown-unknown without webgl feature (gfx-rs#2355)
1 parent f345628 commit 092917e

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

wgpu/src/backend/web.rs

+12-5
Original file line numberDiff line numberDiff line change
@@ -1272,21 +1272,25 @@ impl crate::Context for Context {
12721272
);
12731273
let spv_module_info = validator.validate(&spv_module).unwrap();
12741274

1275-
let wgsl_text = back::wgsl::write_string(&spv_module, &spv_module_info).unwrap();
1275+
let writer_flags = naga::back::wgsl::WriterFlags::empty();
1276+
let wgsl_text =
1277+
back::wgsl::write_string(&spv_module, &spv_module_info, writer_flags).unwrap();
12761278
web_sys::GpuShaderModuleDescriptor::new(wgsl_text.as_str())
12771279
}
12781280
#[cfg(feature = "glsl")]
1279-
ShaderSource::Glsl {
1281+
crate::ShaderSource::Glsl {
12801282
ref shader,
12811283
stage,
12821284
ref defines,
12831285
} => {
1286+
use naga::{back, front, valid};
1287+
12841288
// Parse the given shader code and store its representation.
1285-
let options = naga::front::glsl::Options {
1289+
let options = front::glsl::Options {
12861290
stage,
12871291
defines: defines.clone(),
12881292
};
1289-
let mut parser = naga::front::glsl::Parser::default();
1293+
let mut parser = front::glsl::Parser::default();
12901294
let glsl_module = parser.parse(&options, shader).unwrap();
12911295

12921296
let mut validator = valid::Validator::new(
@@ -1295,7 +1299,10 @@ impl crate::Context for Context {
12951299
);
12961300
let glsl_module_info = validator.validate(&glsl_module).unwrap();
12971301

1298-
let wgsl_text = back::wgsl::write_string(&glsl_module, &glsl_module_info).unwrap();
1302+
let writer_flags = naga::back::wgsl::WriterFlags::empty();
1303+
let wgsl_text =
1304+
back::wgsl::write_string(&glsl_module, &glsl_module_info, writer_flags)
1305+
.unwrap();
12991306
web_sys::GpuShaderModuleDescriptor::new(wgsl_text.as_str())
13001307
}
13011308
crate::ShaderSource::Wgsl(ref code) => web_sys::GpuShaderModuleDescriptor::new(code),

0 commit comments

Comments
 (0)