archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

[rs] Merge #613

Browse Source 
613: Add more context to errors originating in Passes and Encoders r=kvark a=Kimundi

**Description**
This adds some top-level error context information to indicate wether an error originated in a `{Render,Compute}Pass` or `{Command,RenderBundle}Encoder` to make error messages more clear.

Combined with https://github.com/gfx-rs/wgpu/pull/1018, errors in passes will look like this:
```
wgpu error: Validation error

Caused by:
    In a RenderPass
    In a draw command
    index 3600 extends beyond limit 38
```


Co-authored-by: Marvin Löbel <loebel.marvin@gmail.com>
This commit is contained in:
bors[bot] 2020-11-11 04:56:44 +00:00 committed by GitHub
commit 033c896c4f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wgpu/src/backend/direct.rs
View File

@ -1373,6 +1373,7 @@ impl crate::Context for Context {
wgc::gfx_select!( wgc::gfx_select!(
encoder.id => global.command_encoder_run_compute_pass(encoder.id, pass) encoder.id => global.command_encoder_run_compute_pass(encoder.id, pass)
) )
.map_err(|err| err.with_context("In a ComputePass".to_string()))
.unwrap_error_sink(&encoder.error_sink, || ()) .unwrap_error_sink(&encoder.error_sink, || ())
} }
@ -1416,6 +1417,7 @@ impl crate::Context for Context {
) { ) {
let global = &self.0; let global = &self.0;
wgc::gfx_select!(encoder.id => global.command_encoder_run_render_pass(encoder.id, pass)) wgc::gfx_select!(encoder.id => global.command_encoder_run_render_pass(encoder.id, pass))
.map_err(|err| err.with_context("In a RenderPass".to_string()))
.unwrap_error_sink(&encoder.error_sink, || ()) .unwrap_error_sink(&encoder.error_sink, || ())
} }
@ -1423,6 +1425,7 @@ impl crate::Context for Context {
let desc = wgt::CommandBufferDescriptor::default(); let desc = wgt::CommandBufferDescriptor::default();
let global = &self.0; let global = &self.0;
wgc::gfx_select!(encoder.id => global.command_encoder_finish(encoder.id, &desc)) wgc::gfx_select!(encoder.id => global.command_encoder_finish(encoder.id, &desc))
.map_err(|err| err.with_context("In a CommandEncoder".to_string()))
.unwrap_error_sink( .unwrap_error_sink(
&encoder.error_sink, &encoder.error_sink,
|| wgc::gfx_select!( encoder.id => global.command_buffer_error(PhantomData)), || wgc::gfx_select!( encoder.id => global.command_buffer_error(PhantomData)),
@ -1461,6 +1464,7 @@ impl crate::Context for Context {
}, },
PhantomData PhantomData
)) ))
.map_err(|err| err.with_context("In a RenderBundleEncoder".to_string()))
.unwrap_pretty() .unwrap_pretty()
} }