@@ -1272,21 +1272,25 @@ impl crate::Context for Context {
1272
1272
) ;
1273
1273
let spv_module_info = validator. validate ( & spv_module) . unwrap ( ) ;
1274
1274
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 ( ) ;
1276
1278
web_sys:: GpuShaderModuleDescriptor :: new ( wgsl_text. as_str ( ) )
1277
1279
}
1278
1280
#[ cfg( feature = "glsl" ) ]
1279
- ShaderSource :: Glsl {
1281
+ crate :: ShaderSource :: Glsl {
1280
1282
ref shader,
1281
1283
stage,
1282
1284
ref defines,
1283
1285
} => {
1286
+ use naga:: { back, front, valid} ;
1287
+
1284
1288
// Parse the given shader code and store its representation.
1285
- let options = naga :: front:: glsl:: Options {
1289
+ let options = front:: glsl:: Options {
1286
1290
stage,
1287
1291
defines : defines. clone ( ) ,
1288
1292
} ;
1289
- let mut parser = naga :: front:: glsl:: Parser :: default ( ) ;
1293
+ let mut parser = front:: glsl:: Parser :: default ( ) ;
1290
1294
let glsl_module = parser. parse ( & options, shader) . unwrap ( ) ;
1291
1295
1292
1296
let mut validator = valid:: Validator :: new (
@@ -1295,7 +1299,10 @@ impl crate::Context for Context {
1295
1299
) ;
1296
1300
let glsl_module_info = validator. validate ( & glsl_module) . unwrap ( ) ;
1297
1301
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 ( ) ;
1299
1306
web_sys:: GpuShaderModuleDescriptor :: new ( wgsl_text. as_str ( ) )
1300
1307
}
1301
1308
crate :: ShaderSource :: Wgsl ( ref code) => web_sys:: GpuShaderModuleDescriptor :: new ( code) ,
0 commit comments