KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radv: save/restore the stencil reference during internal driver operations 

I think I should improve this to be more robust.

Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6243
Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15700>
This commit is contained in:
Samuel Pitoiset 2022-03-31 20:20:35 +02:00 committed by Marge Bot
parent 41ece97afb
commit c439735a91
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/amd/vulkan/radv_meta.c
View File

@ -121,6 +121,9 @@ radv_meta_save(struct radv_meta_saved_state *state, struct radv_cmd_buffer *cmd_
state->stencil_write_mask.front = cmd_buffer->state.dynamic.stencil_write_mask.front;
state->stencil_write_mask.back = cmd_buffer->state.dynamic.stencil_write_mask.back;
state->stencil_reference.front = cmd_buffer->state.dynamic.stencil_reference.front;
state->stencil_reference.back = cmd_buffer->state.dynamic.stencil_reference.back;
state->fragment_shading_rate.size = cmd_buffer->state.dynamic.fragment_shading_rate.size;
state->fragment_shading_rate.combiner_ops[0] =
cmd_buffer->state.dynamic.fragment_shading_rate.combiner_ops[0];
@ -220,6 +223,9 @@ radv_meta_restore(const struct radv_meta_saved_state *state, struct radv_cmd_buf
cmd_buffer->state.dynamic.stencil_write_mask.front = state->stencil_write_mask.front;
cmd_buffer->state.dynamic.stencil_write_mask.back = state->stencil_write_mask.back;
cmd_buffer->state.dynamic.stencil_reference.front = state->stencil_reference.front;
cmd_buffer->state.dynamic.stencil_reference.back = state->stencil_reference.back;
cmd_buffer->state.dynamic.fragment_shading_rate.size = state->fragment_shading_rate.size;
cmd_buffer->state.dynamic.fragment_shading_rate.combiner_ops[0] =
state->fragment_shading_rate.combiner_ops[0];
@ -243,7 +249,7 @@ radv_meta_restore(const struct radv_meta_saved_state *state, struct radv_cmd_buf
RADV_CMD_DIRTY_DYNAMIC_DEPTH_WRITE_ENABLE | RADV_CMD_DIRTY_DYNAMIC_DEPTH_COMPARE_OP |
RADV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE |
RADV_CMD_DIRTY_DYNAMIC_STENCIL_TEST_ENABLE | RADV_CMD_DIRTY_DYNAMIC_STENCIL_OP |
RADV_CMD_DIRTY_DYNAMIC_STENCIL_WRITE_MASK |
RADV_CMD_DIRTY_DYNAMIC_STENCIL_WRITE_MASK | RADV_CMD_DIRTY_DYNAMIC_STENCIL_REFERENCE |
RADV_CMD_DIRTY_DYNAMIC_FRAGMENT_SHADING_RATE | RADV_CMD_DIRTY_DYNAMIC_DEPTH_BIAS_ENABLE |
RADV_CMD_DIRTY_DYNAMIC_PRIMITIVE_RESTART_ENABLE |
RADV_CMD_DIRTY_DYNAMIC_RASTERIZER_DISCARD_ENABLE | RADV_CMD_DIRTY_DYNAMIC_LOGIC_OP |

5
src/amd/vulkan/radv_meta.h
View File

@ -91,6 +91,11 @@ struct radv_meta_saved_state {
} back;
} stencil_op;
struct {
uint32_t front;
uint32_t back;
} stencil_reference;
struct {
VkExtent2D size;
VkFragmentShadingRateCombinerOpKHR combiner_ops[2];

6
src/gallium/drivers/zink/ci/zink-radv-fails.txt
View File

@ -200,8 +200,6 @@ glx@glx-visuals-depth -pixmap,Crash
glx@glx-visuals-stencil,Crash
glx@glx-visuals-stencil -pixmap,Crash
GTF-GL46.gtf30.GL3Tests.packed_depth_stencil.packed_depth_stencil_blit,Fail
GTF-GL46.gtf30.GL3Tests.packed_depth_stencil.packed_depth_stencil_clearbuffer,Fail
GTF-GL46.gtf30.GL3Tests.transform_feedback.transform_feedback_builtins,Fail
KHR-GL46.blend_equation_advanced.blend_all.GL_COLORBURN_KHR_all_qualifier,Fail
@ -235,10 +233,6 @@ KHR-GL46.blend_equation_advanced.blend_specific.GL_OVERLAY_KHR,Fail
KHR-GL46.blend_equation_advanced.blend_specific.GL_SCREEN_KHR,Fail
KHR-GL46.blend_equation_advanced.blend_specific.GL_SOFTLIGHT_KHR,Fail
KHR-GL46.gpu_shader_fp64.fp64.varyings,Fail
KHR-GL46.packed_depth_stencil.blit.depth24_stencil8,Fail
KHR-GL46.packed_depth_stencil.blit.depth32f_stencil8,Fail
KHR-GL46.packed_depth_stencil.clear_buffer.depth24_stencil8,Fail
KHR-GL46.packed_depth_stencil.clear_buffer.depth32f_stencil8,Fail
KHR-GL46.shader_ballot_tests.ShaderBallotFunctionRead,Fail
KHR-GL46.shader_image_load_store.basic-allTargets-atomicCS,Fail
KHR-GL46.shader_image_load_store.basic-allTargets-atomicGS,Fail