nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-20 10:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1380 from fintelia/patch-1

Browse Source 
Include shader label in log message if shader parsing fails
This commit is contained in:
Connor Fitzgerald 2021-05-08 23:28:17 -04:00 committed by GitHub
commit 6485fc0ca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wgpu-core/src/device/mod.rs
View File

@ -1016,7 +1016,7 @@ impl<B: GfxBackend> Device<B> {
let module = match parser.parse() { let module = match parser.parse() {
Ok(module) => Some(module), Ok(module) => Some(module),
Err(err) => { Err(err) => {
log::warn!("Failed to parse shader SPIR-V code: {:?}", err); log::warn!("Failed to parse shader SPIR-V code for {:?}: {:?}", desc.label, err);
if desc.flags.contains(wgt::ShaderFlags::VALIDATION) { if desc.flags.contains(wgt::ShaderFlags::VALIDATION) {
return Err(pipeline::CreateShaderModuleError::Parsing); return Err(pipeline::CreateShaderModuleError::Parsing);
} }
@ -1033,7 +1033,7 @@ impl<B: GfxBackend> Device<B> {
match naga::front::wgsl::parse_str(&code) { match naga::front::wgsl::parse_str(&code) {
Ok(module) => (None, Some(module)), Ok(module) => (None, Some(module)),
Err(err) => { Err(err) => {
log::error!("Failed to parse WGSL code: {}", err); log::error!("Failed to parse WGSL code for {:?}: {}", desc.label, err);
return Err(pipeline::CreateShaderModuleError::Parsing); return Err(pipeline::CreateShaderModuleError::Parsing);
} }
} }