mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 15:00:57 +01:00
Align stencil reference flags between pipeline creation and setting
This commit is contained in:
1 parent
05ae7d5f5b
commit
4501a4a3d3
2 files changed
+25
-13
No files matched your search
@@ -269,9 +269,10 @@ impl VertexState {
|
|||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct State {
|
struct State {
|
||||||
|
pipeline_flags: PipelineFlags,
|
||||||
binder: Binder,
|
binder: Binder,
|
||||||
blend_color: OptionalState,
|
blend_color: OptionalState,
|
||||||
stencil_reference: OptionalState,
|
stencil_reference: u32,
|
||||||
pipeline: OptionalState,
|
pipeline: OptionalState,
|
||||||
index: IndexState,
|
index: IndexState,
|
||||||
vertex: VertexState,
|
vertex: VertexState,
|
||||||
@@ -294,9 +295,6 @@ impl State {
|
|||||||
if self.blend_color == OptionalState::Required {
|
if self.blend_color == OptionalState::Required {
|
||||||
return Err(DrawError::MissingBlendColor);
|
return Err(DrawError::MissingBlendColor);
|
||||||
}
|
}
|
||||||
if self.stencil_reference == OptionalState::Required {
|
|
||||||
return Err(DrawError::MissingStencilReference);
|
|
||||||
}
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -929,9 +927,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let mut state = State {
|
let mut state = State {
|
||||||
|
pipeline_flags: PipelineFlags::empty(),
|
||||||
binder: Binder::new(cmd_buf.limits.max_bind_groups),
|
binder: Binder::new(cmd_buf.limits.max_bind_groups),
|
||||||
blend_color: OptionalState::Unused,
|
blend_color: OptionalState::Unused,
|
||||||
stencil_reference: OptionalState::Unused,
|
stencil_reference: 0,
|
||||||
pipeline: OptionalState::Required,
|
pipeline: OptionalState::Required,
|
||||||
index: IndexState::default(),
|
index: IndexState::default(),
|
||||||
vertex: VertexState::default(),
|
vertex: VertexState::default(),
|
||||||
@@ -995,12 +994,14 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
RenderCommand::SetPipeline(pipeline_id) => {
|
RenderCommand::SetPipeline(pipeline_id) => {
|
||||||
state.pipeline = OptionalState::Set;
|
|
||||||
let pipeline = trackers
|
let pipeline = trackers
|
||||||
.render_pipes
|
.render_pipes
|
||||||
.use_extend(&*pipeline_guard, pipeline_id, (), ())
|
.use_extend(&*pipeline_guard, pipeline_id, (), ())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
state.pipeline = OptionalState::Set;
|
||||||
|
state.pipeline_flags = pipeline.flags;
|
||||||
|
|
||||||
if !context.compatible(&pipeline.pass_context) {
|
if !context.compatible(&pipeline.pass_context) {
|
||||||
return Err(RenderCommandError::IncompatiblePipeline.into());
|
return Err(RenderCommandError::IncompatiblePipeline.into());
|
||||||
}
|
}
|
||||||
@@ -1013,14 +1014,20 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
|||||||
state
|
state
|
||||||
.blend_color
|
.blend_color
|
||||||
.require(pipeline.flags.contains(PipelineFlags::BLEND_COLOR));
|
.require(pipeline.flags.contains(PipelineFlags::BLEND_COLOR));
|
||||||
state
|
|
||||||
.stencil_reference
|
|
||||||
.require(pipeline.flags.contains(PipelineFlags::STENCIL_REFERENCE));
|
|
||||||
|
|
||||||
unsafe {
|
unsafe {
|
||||||
raw.bind_graphics_pipeline(&pipeline.raw);
|
raw.bind_graphics_pipeline(&pipeline.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if pipeline.flags.contains(PipelineFlags::STENCIL_REFERENCE) {
|
||||||
|
unsafe {
|
||||||
|
raw.set_stencil_reference(
|
||||||
|
hal::pso::Face::all(),
|
||||||
|
state.stencil_reference,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Rebind resource
|
// Rebind resource
|
||||||
if state.binder.pipeline_layout_id != Some(pipeline.layout_id.value) {
|
if state.binder.pipeline_layout_id != Some(pipeline.layout_id.value) {
|
||||||
let pipeline_layout = &pipeline_layout_guard[pipeline.layout_id.value];
|
let pipeline_layout = &pipeline_layout_guard[pipeline.layout_id.value];
|
||||||
@@ -1187,9 +1194,14 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
RenderCommand::SetStencilReference(value) => {
|
RenderCommand::SetStencilReference(value) => {
|
||||||
state.stencil_reference = OptionalState::Set;
|
state.stencil_reference = value;
|
||||||
unsafe {
|
if state
|
||||||
raw.set_stencil_reference(hal::pso::Face::all(), value);
|
.pipeline_flags
|
||||||
|
.contains(PipelineFlags::STENCIL_REFERENCE)
|
||||||
|
{
|
||||||
|
unsafe {
|
||||||
|
raw.set_stencil_reference(hal::pso::Face::all(), value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RenderCommand::SetViewport {
|
RenderCommand::SetViewport {
|
||||||
|
|||||||
@@ -2928,7 +2928,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(ds) = depth_stencil_state.as_ref() {
|
if let Some(ds) = depth_stencil_state.as_ref() {
|
||||||
if ds.stencil.needs_ref_value() {
|
if ds.stencil.is_enabled() && ds.stencil.needs_ref_value() {
|
||||||
flags |= pipeline::PipelineFlags::STENCIL_REFERENCE;
|
flags |= pipeline::PipelineFlags::STENCIL_REFERENCE;
|
||||||
}
|
}
|
||||||
if !ds.is_read_only() {
|
if !ds.is_read_only() {
|
||||||
|
|||||||
Reference in new issue
Block a user