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

move same device checks in render_pass_end

Browse Source
This commit is contained in:
teoxoy 2024-07-17 16:10:17 +02:00 committed by Erich Gubler
parent 911d28fd1a
commit 7761b5723d
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -817,7 +817,7 @@ impl<'d, A: HalApi> RenderPassInfo<'d, A> {
}
fn start(
device: &'d Device<A>,
device: &'d Arc<Device<A>>,
hal_label: Option<&str>,
color_attachments: ArrayVec<
Option<ArcRenderPassColorAttachment<A>>,
@ -919,6 +919,7 @@ impl<'d, A: HalApi> RenderPassInfo<'d, A> {
if let Some(at) = depth_stencil_attachment.as_ref() {
let view = &at.view;
view.same_device(device)?;
check_multiview(view)?;
add_view(view, AttachmentErrorLocation::Depth)?;
@ -1049,6 +1050,7 @@ impl<'d, A: HalApi> RenderPassInfo<'d, A> {
continue;
};
let color_view: &TextureView<A> = &at.view;
color_view.same_device(device)?;
check_multiview(color_view)?;
add_view(
color_view,
@ -1079,6 +1081,7 @@ impl<'d, A: HalApi> RenderPassInfo<'d, A> {
let mut hal_resolve_target = None;
if let Some(resolve_view) = &at.resolve_target {
resolve_view.same_device(device)?;
check_multiview(resolve_view)?;
let resolve_location = AttachmentErrorLocation::Color {
@ -1178,8 +1181,9 @@ impl<'d, A: HalApi> RenderPassInfo<'d, A> {
multiview,
};
let timestamp_writes_hal = timestamp_writes.as_ref().map(|tw| {
let timestamp_writes_hal = if let Some(tw) = timestamp_writes.as_ref() {
let query_set = &tw.query_set;
query_set.same_device(device)?;
if let Some(index) = tw.beginning_of_pass_write_index {
pending_query_resets.use_query_set(query_set, index);
@ -1188,16 +1192,21 @@ impl<'d, A: HalApi> RenderPassInfo<'d, A> {
pending_query_resets.use_query_set(query_set, index);
}
hal::RenderPassTimestampWrites {
Some(hal::RenderPassTimestampWrites {
query_set: query_set.raw.as_ref().unwrap(),
beginning_of_pass_write_index: tw.beginning_of_pass_write_index,
end_of_pass_write_index: tw.end_of_pass_write_index,
}
});
})
} else {
None
};
let occlusion_query_set_hal = occlusion_query_set
.as_ref()
.map(|query_set| query_set.raw.as_ref().unwrap());
let occlusion_query_set_hal = if let Some(query_set) = occlusion_query_set.as_ref() {
query_set.same_device(device)?;
Some(query_set.raw.as_ref().unwrap())
} else {
None
};
let hal_desc = hal::RenderPassDescriptor {
label: hal_label,
@ -1331,7 +1340,6 @@ impl Global {
) -> (RenderPass<A>, Option<CommandEncoderError>) {
fn fill_arc_desc<A: HalApi>(
hub: &crate::hub::Hub<A>,
device: &Arc<Device<A>>,
desc: &RenderPassDescriptor<'_>,
arc_desc: &mut ArcRenderPassDescriptor<A>,
) -> Result<(), CommandEncoderError> {
@ -1348,13 +1356,11 @@ impl Global {
let view = texture_views
.get_owned(*view_id)
.map_err(|_| CommandEncoderError::InvalidAttachmentId(*view_id))?;
view.same_device(device)?;
let resolve_target = if let Some(resolve_target_id) = resolve_target {
let rt_arc = texture_views.get_owned(*resolve_target_id).map_err(|_| {
CommandEncoderError::InvalidResolveTargetId(*resolve_target_id)
})?;
rt_arc.same_device(device)?;
Some(rt_arc)
} else {
@ -1382,7 +1388,6 @@ impl Global {
depth_stencil_attachment.view,
)
})?;
view.same_device(device)?;
Some(ArcRenderPassDepthStencilAttachment {
view,
@ -1397,7 +1402,6 @@ impl Global {
let query_set = query_sets.get_owned(tw.query_set).map_err(|_| {
CommandEncoderError::InvalidTimestampWritesQuerySetId(tw.query_set)
})?;
query_set.same_device(device)?;
Some(ArcPassTimestampWrites {
query_set,
@ -1413,7 +1417,6 @@ impl Global {
let query_set = query_sets.get_owned(occlusion_query_set).map_err(|_| {
CommandEncoderError::InvalidOcclusionQuerySetId(occlusion_query_set)
})?;
query_set.same_device(device)?;
Some(query_set)
} else {
@ -1444,7 +1447,7 @@ impl Global {
Err(e) => return make_err(e, arc_desc),
};
let err = fill_arc_desc(hub, &cmd_buf.device, desc, &mut arc_desc).err();
let err = fill_arc_desc(hub, desc, &mut arc_desc).err();
(RenderPass::new(Some(cmd_buf), arc_desc), err)
}