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

inline ComputePass.parent_id()

Browse Source
This commit is contained in:
teoxoy 2024-06-21 12:57:04 +02:00 committed by Teodor Tanasoaia
parent f55fa6e217
commit 3005b46a29
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wgpu-core/src/command/compute.rs
View File

@ -72,11 +72,6 @@ impl<A: HalApi> ComputePass<A> {
} }
} }
#[inline]
pub fn parent_id(&self) -> Option<id::CommandBufferId> {
self.parent.as_ref().map(|cmd_buf| cmd_buf.as_info().id())
}
#[inline] #[inline]
pub fn label(&self) -> Option<&str> { pub fn label(&self) -> Option<&str> {
self.base.as_ref().and_then(|base| base.label.as_deref()) self.base.as_ref().and_then(|base| base.label.as_deref())
@ -95,7 +90,10 @@ impl<A: HalApi> ComputePass<A> {
impl<A: HalApi> fmt::Debug for ComputePass<A> { impl<A: HalApi> fmt::Debug for ComputePass<A> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "ComputePass {{ parent: {:?} }}", self.parent_id()) match self.parent {
Some(ref cmd_buf) => write!(f, "ComputePass {{ parent: {} }}", cmd_buf.error_ident()),
None => write!(f, "ComputePass {{ parent: None }}"),
}
} }
} }
@ -380,19 +378,22 @@ impl Global {
&self, &self,
pass: &mut ComputePass<A>, pass: &mut ComputePass<A>,
) -> Result<(), ComputePassError> { ) -> Result<(), ComputePassError> {
let scope = PassErrorScope::Pass(pass.parent_id()); let cmd_buf = pass
let Some(parent) = pass.parent.as_ref() else { .parent
return Err(ComputePassErrorInner::InvalidParentEncoder).map_pass_err(scope); .as_ref()
}; .ok_or(ComputePassErrorInner::InvalidParentEncoder)
.map_pass_err(PassErrorScope::Pass(None))?;
parent.unlock_encoder().map_pass_err(scope)?; let scope = PassErrorScope::Pass(Some(cmd_buf.as_info().id()));
cmd_buf.unlock_encoder().map_pass_err(scope)?;
let base = pass let base = pass
.base .base
.take() .take()
.ok_or(ComputePassErrorInner::PassEnded) .ok_or(ComputePassErrorInner::PassEnded)
.map_pass_err(scope)?; .map_pass_err(scope)?;
self.compute_pass_end_impl(parent, base, pass.timestamp_writes.take()) self.compute_pass_end_impl(cmd_buf, base, pass.timestamp_writes.take())
} }
#[doc(hidden)] #[doc(hidden)]