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

Error type for command_encoder_finish

Browse Source
This commit is contained in:
Gabriel Majeri 2020-07-18 10:46:47 +03:00
parent a689aea3f2
commit 04b0b4d3a5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
player/src/lib.rs
View File

@ -136,6 +136,7 @@ impl GlobalPlay for wgc::hub::Global<IdentityPassThroughFactory> {
} }
} }
self.command_encoder_finish::<B>(encoder, &wgt::CommandBufferDescriptor { todo: 0 }) self.command_encoder_finish::<B>(encoder, &wgt::CommandBufferDescriptor { todo: 0 })
.unwrap()
} }
fn process<B: wgc::hub::GfxBackend>( fn process<B: wgc::hub::GfxBackend>(

15
wgpu-core/src/command/mod.rs
View File

@ -26,6 +26,7 @@ use crate::{
}; };
use hal::command::CommandBuffer as _; use hal::command::CommandBuffer as _;
use thiserror::Error;
use std::thread::ThreadId; use std::thread::ThreadId;
@ -141,12 +142,18 @@ impl<C: Clone> BasePass<C> {
} }
} }
#[derive(Clone, Debug, Error)]
pub enum CommandEncoderFinishError {
#[error("command buffer must be recording")]
NotRecording,
}
impl<G: GlobalIdentityHandlerFactory> Global<G> { impl<G: GlobalIdentityHandlerFactory> Global<G> {
pub fn command_encoder_finish<B: GfxBackend>( pub fn command_encoder_finish<B: GfxBackend>(
&self, &self,
encoder_id: id::CommandEncoderId, encoder_id: id::CommandEncoderId,
_desc: &wgt::CommandBufferDescriptor, _desc: &wgt::CommandBufferDescriptor,
) -> id::CommandBufferId { ) -> Result<id::CommandBufferId, CommandEncoderFinishError> {
span!(_guard, INFO, "CommandEncoder::finish"); span!(_guard, INFO, "CommandEncoder::finish");
let hub = B::hub(self); let hub = B::hub(self);
@ -155,7 +162,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
//TODO: actually close the last recorded command buffer //TODO: actually close the last recorded command buffer
let (mut comb_guard, _) = hub.command_buffers.write(&mut token); let (mut comb_guard, _) = hub.command_buffers.write(&mut token);
let comb = &mut comb_guard[encoder_id]; let comb = &mut comb_guard[encoder_id];
assert!(comb.is_recording, "Command buffer must be recording"); if !comb.is_recording {
return Err(CommandEncoderFinishError::NotRecording);
}
comb.is_recording = false; comb.is_recording = false;
// stop tracking the swapchain image, if used // stop tracking the swapchain image, if used
if let Some((ref sc_id, _)) = comb.used_swap_chain { if let Some((ref sc_id, _)) = comb.used_swap_chain {
@ -166,7 +175,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
comb.trackers.views.remove(view_id.value); comb.trackers.views.remove(view_id.value);
} }
log::trace!("Command buffer {:?} {:#?}", encoder_id, comb.trackers); log::trace!("Command buffer {:?} {:#?}", encoder_id, comb.trackers);
encoder_id Ok(encoder_id)
} }
pub fn command_encoder_push_debug_group<B: GfxBackend>( pub fn command_encoder_push_debug_group<B: GfxBackend>(