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 23:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check bundle RODS against pass RODS

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-07-22 17:45:41 -04:00
parent bb218c1580
commit 34b68121c6
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wgpu-core/src/command/bundle.rs
View File

@ -243,13 +243,13 @@ impl RenderBundleEncoder {
self.context
.check_compatible(&pipeline.pass_context)
.map_err(RenderCommandError::IncompatiblePipeline)
.map_err(RenderCommandError::IncompatiblePipelineTargets)
.map_pass_err(scope)?;
if pipeline.flags.contains(PipelineFlags::WRITES_DEPTH_STENCIL)
&& self.is_ds_read_only
{
return Err(RenderCommandError::IncompatibleReadOnlyDepthStencil)
return Err(RenderCommandError::IncompatiblePipelineRods)
.map_pass_err(scope);
}
@ -517,6 +517,7 @@ impl RenderBundleEncoder {
string_data: Vec::new(),
push_constant_data: Vec::new(),
},
is_ds_read_only: self.is_ds_read_only,
device_id: Stored {
value: id::Valid(self.parent_id),
ref_count: device.life_guard.add_ref(),
@ -570,10 +571,11 @@ pub struct RenderBundle {
// Normalized command stream. It can be executed verbatim,
// without re-binding anything on the pipeline change.
base: BasePass<RenderCommand>,
pub(super) is_ds_read_only: bool,
pub(crate) device_id: Stored<id::DeviceId>,
pub(crate) used: TrackerSet,
pub(crate) buffer_memory_init_actions: Vec<MemoryInitTrackerAction<id::BufferId>>,
pub(crate) context: RenderPassContext,
pub(super) buffer_memory_init_actions: Vec<MemoryInitTrackerAction<id::BufferId>>,
pub(super) context: RenderPassContext,
pub(crate) life_guard: LifeGuard,
}
@ -590,7 +592,7 @@ impl RenderBundle {
/// Note that the function isn't expected to fail, generally.
/// All the validation has already been done by this point.
/// The only failure condition is if some of the used buffers are destroyed.
pub(crate) unsafe fn execute<A: HalApi>(
pub(super) unsafe fn execute<A: HalApi>(
&self,
raw: &mut A::CommandEncoder,
pipeline_layout_guard: &Storage<

8
wgpu-core/src/command/draw.rs
View File

@ -72,10 +72,10 @@ pub enum RenderCommandError {
InvalidPipeline(id::RenderPipelineId),
#[error("QuerySet {0:?} is invalid")]
InvalidQuerySet(id::QuerySetId),
#[error("Render pipeline is incompatible with render pass")]
IncompatiblePipeline(#[from] crate::device::RenderPassCompatibilityError),
#[error("pipeline is not compatible with the depth-stencil read-only render pass")]
IncompatibleReadOnlyDepthStencil,
#[error("Render pipeline targets are incompatible with render pass")]
IncompatiblePipelineTargets(#[from] crate::device::RenderPassCompatibilityError),
#[error("pipeline writes to depth/stencil, while the pass has read-only depth/stencil")]
IncompatiblePipelineRods,
#[error("buffer {0:?} is in error {1:?}")]
Buffer(id::BufferId, BufferError),
#[error("buffer {0:?} is destroyed")]

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

@ -444,8 +444,10 @@ pub enum RenderPassErrorInner {
InvalidPopDebugGroup,
#[error(transparent)]
ResourceUsageConflict(#[from] UsageConflict),
#[error("render bundle is incompatible, {0}")]
IncompatibleRenderBundle(#[from] RenderPassCompatibilityError),
#[error("render bundle has incompatible targets, {0}")]
IncompatibleBundleTargets(#[from] RenderPassCompatibilityError),
#[error("render bundle has an incompatible read-only depth/stencil flag: bundle is {bundle}, while the pass is {pass}")]
IncompatibleBundleRods { pass: bool, bundle: bool },
#[error(transparent)]
RenderCommand(#[from] RenderCommandError),
#[error(transparent)]
@ -994,7 +996,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
info.context
.check_compatible(&pipeline.pass_context)
.map_err(RenderCommandError::IncompatiblePipeline)
.map_err(RenderCommandError::IncompatiblePipelineTargets)
.map_pass_err(scope)?;
state.pipeline_flags = pipeline.flags;
@ -1002,7 +1004,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
if pipeline.flags.contains(PipelineFlags::WRITES_DEPTH_STENCIL)
&& info.is_ds_read_only
{
return Err(RenderCommandError::IncompatibleReadOnlyDepthStencil)
return Err(RenderCommandError::IncompatiblePipelineRods)
.map_pass_err(scope);
}
@ -1678,9 +1680,17 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
info.context
.check_compatible(&bundle.context)
.map_err(RenderPassErrorInner::IncompatibleRenderBundle)
.map_err(RenderPassErrorInner::IncompatibleBundleTargets)
.map_pass_err(scope)?;
if info.is_ds_read_only != bundle.is_ds_read_only {
return Err(RenderPassErrorInner::IncompatibleBundleRods {
pass: info.is_ds_read_only,
bundle: bundle.is_ds_read_only,
})
.map_pass_err(scope);
}
cmd_buf.buffer_memory_init_actions.extend(
bundle
.buffer_memory_init_actions