nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 00:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

add missing same device checks

Browse Source
This commit is contained in:
teoxoy 2024-07-17 16:54:36 +02:00 committed by Erich Gubler
parent 2f7860b6e4
commit 63303d4b4e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wgpu-core/src/command/render.rs
View File

@ -1791,7 +1791,7 @@ impl Global {
},
indexed,
};
multi_draw_indirect(&mut state, buffer, offset, count, indexed)
multi_draw_indirect(&mut state, cmd_buf, buffer, offset, count, indexed)
.map_pass_err(scope)?;
}
ArcRenderCommand::MultiDrawIndirectCount {
@ -1808,6 +1808,7 @@ impl Global {
};
multi_draw_indirect_count(
&mut state,
cmd_buf,
buffer,
offset,
count_buffer,
@ -1834,6 +1835,7 @@ impl Global {
let scope = PassErrorScope::WriteTimestamp;
write_timestamp(
&mut state,
cmd_buf,
&mut cmd_buf_data.pending_query_resets,
query_set,
query_index,
@ -2448,6 +2450,7 @@ fn draw_indexed<A: HalApi>(
fn multi_draw_indirect<A: HalApi>(
state: &mut State<A>,
cmd_buf: &Arc<CommandBuffer<A>>,
indirect_buffer: Arc<crate::resource::Buffer<A>>,
offset: u64,
count: Option<NonZeroU32>,
@ -2474,6 +2477,8 @@ fn multi_draw_indirect<A: HalApi>(
.device
.require_downlevel_flags(wgt::DownlevelFlags::INDIRECT_EXECUTION)?;
indirect_buffer.same_device_as(cmd_buf.as_ref())?;
state
.info
.usage_scope
@ -2520,6 +2525,7 @@ fn multi_draw_indirect<A: HalApi>(
fn multi_draw_indirect_count<A: HalApi>(
state: &mut State<A>,
cmd_buf: &Arc<CommandBuffer<A>>,
indirect_buffer: Arc<crate::resource::Buffer<A>>,
offset: u64,
count_buffer: Arc<crate::resource::Buffer<A>>,
@ -2547,6 +2553,9 @@ fn multi_draw_indirect_count<A: HalApi>(
.device
.require_downlevel_flags(wgt::DownlevelFlags::INDIRECT_EXECUTION)?;
indirect_buffer.same_device_as(cmd_buf.as_ref())?;
count_buffer.same_device_as(cmd_buf.as_ref())?;
state
.info
.usage_scope
@ -2677,6 +2686,7 @@ fn insert_debug_marker<A: HalApi>(state: &mut State<A>, string_data: &[u8], len:
fn write_timestamp<A: HalApi>(
state: &mut State<A>,
cmd_buf: &CommandBuffer<A>,
pending_query_resets: &mut QueryResetMap<A>,
query_set: Arc<QuerySet<A>>,
query_index: u32,
@ -2686,6 +2696,8 @@ fn write_timestamp<A: HalApi>(
query_set.error_ident()
);
query_set.same_device_as(cmd_buf)?;
state
.device
.require_features(wgt::Features::TIMESTAMP_QUERY_INSIDE_PASSES)?;

1
wgpu-core/src/device/resource.rs
View File

@ -3119,6 +3119,7 @@ impl<A: HalApi> Device<A> {
let stage = wgt::ShaderStages::FRAGMENT;
let shader_module = &fragment_state.stage.module;
shader_module.same_device(self)?;
let stage_err = |error| pipeline::CreateRenderPipelineError::Stage { stage, error };