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] Update wgpu-core

Browse Source 
Pass label to error id creation methods.
This commit is contained in:
Mikko Lehtonen 2020-11-18 22:58:31 +02:00
parent ed96a4218f
commit dd7f1735f3
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wgpu/Cargo.toml
View File

@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan", "gfx-backend-vulkan"]
package = "wgpu-core" package = "wgpu-core"
#version = "0.6" #version = "0.6"
git = "https://github.com/gfx-rs/wgpu" git = "https://github.com/gfx-rs/wgpu"
rev = "5e1226995c368f9b4cfde2da7f5d6c12d22e1bf2" rev = "19b4ec58ae4fb065dcbcf4825f5852b0d10520d0"
features = ["raw-window-handle"] features = ["raw-window-handle"]
[dependencies.wgt] [dependencies.wgt]
package = "wgpu-types" package = "wgpu-types"
#version = "0.6" #version = "0.6"
git = "https://github.com/gfx-rs/wgpu" git = "https://github.com/gfx-rs/wgpu"
rev = "5e1226995c368f9b4cfde2da7f5d6c12d22e1bf2" rev = "19b4ec58ae4fb065dcbcf4825f5852b0d10520d0"
[dependencies] [dependencies]
arrayvec = "0.5" arrayvec = "0.5"

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

@ -671,7 +671,7 @@ impl crate::Context for Context {
}, PhantomData) }, PhantomData)
) )
.map_err(|err| err.with_context(format!("In Device::create_bind_group_layout with label {:?}", desc.label))) .map_err(|err| err.with_context(format!("In Device::create_bind_group_layout with label {:?}", desc.label)))
.unwrap_error_sink(&device.error_sink, || wgc::gfx_select!( device.id => global.bind_group_layout_error(PhantomData))) .unwrap_error_sink(&device.error_sink, || wgc::gfx_select!( device.id => global.bind_group_layout_error(PhantomData, desc.label)))
} }
fn device_create_bind_group( fn device_create_bind_group(
@ -730,7 +730,7 @@ impl crate::Context for Context {
}) })
.unwrap_error_sink( .unwrap_error_sink(
&device.error_sink, &device.error_sink,
|| wgc::gfx_select!( device.id => global.bind_group_error(PhantomData)), || wgc::gfx_select!( device.id => global.bind_group_error(PhantomData, desc.label)),
) )
} }
@ -774,7 +774,7 @@ impl crate::Context for Context {
}) })
.unwrap_error_sink( .unwrap_error_sink(
&device.error_sink, &device.error_sink,
|| wgc::gfx_select!( device.id => global.pipeline_layout_error(PhantomData)), || wgc::gfx_select!( device.id => global.pipeline_layout_error(PhantomData, desc.label)),
) )
} }
@ -846,8 +846,8 @@ impl crate::Context for Context {
desc.label desc.label
)) ))
}) })
.unwrap_error_sink(&device.error_sink, || { .unwrap_error_sink(&device.error_sink, || {
let err = wgc::gfx_select!( device.id => global.render_pipeline_error(PhantomData)); let err = wgc::gfx_select!( device.id => global.render_pipeline_error(PhantomData, desc.label));
(err, 0u8) (err, 0u8)
}) })
.0 .0
@ -889,7 +889,7 @@ impl crate::Context for Context {
)) ))
}) })
.unwrap_error_sink(&device.error_sink, || { .unwrap_error_sink(&device.error_sink, || {
let err = wgc::gfx_select!( device.id => global.compute_pipeline_error(PhantomData)); let err = wgc::gfx_select!( device.id => global.compute_pipeline_error(PhantomData, desc.label));
(err, 0u8) (err, 0u8)
}) })
.0 .0
@ -919,7 +919,7 @@ impl crate::Context for Context {
}) })
.unwrap_error_sink( .unwrap_error_sink(
&device.error_sink, &device.error_sink,
|| wgc::gfx_select!( device.id => global.buffer_error(PhantomData)), || wgc::gfx_select!( device.id => global.buffer_error(PhantomData, desc.label)),
); );
Buffer { Buffer {
id: buffer_id, id: buffer_id,
@ -954,7 +954,7 @@ impl crate::Context for Context {
}) })
.unwrap_error_sink( .unwrap_error_sink(
&device.error_sink, &device.error_sink,
|| wgc::gfx_select!( device.id => global.texture_error(PhantomData)), || wgc::gfx_select!( device.id => global.texture_error(PhantomData, desc.label)),
); );
Texture { Texture {
id: texture_id, id: texture_id,
@ -992,7 +992,7 @@ impl crate::Context for Context {
}) })
.unwrap_error_sink( .unwrap_error_sink(
&device.error_sink, &device.error_sink,
|| wgc::gfx_select!( device.id => global.sampler_error(PhantomData)), || wgc::gfx_select!( device.id => global.sampler_error(PhantomData, desc.label)),
) )
} }
@ -1212,7 +1212,7 @@ impl crate::Context for Context {
}) })
.unwrap_error_sink( .unwrap_error_sink(
&texture.error_sink, &texture.error_sink,
|| wgc::gfx_select!( texture.id =>global.texture_view_error(PhantomData)), || wgc::gfx_select!( texture.id =>global.texture_view_error(PhantomData, desc.label)),
) )
} }
@ -1447,7 +1447,7 @@ impl crate::Context for Context {
.map_err(|err| err.with_context("In a CommandEncoder".to_string())) .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, None)),
) )
} }