OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turnip: set VFD_INDEX_OFFSET in 3D clear/blit path

Browse Source 
This was missing an causing flakes when used after a test that set it to
a non-zero value.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5509>
This commit is contained in:
Jonathan Marek
2020-06-16 18:54:47 -04:00
committed by Marge Bot
parent 4d13e35315
commit 1622787ee4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/deqp-freedreno-a630-skips.txt
View File

@@ -63,8 +63,6 @@ dEQP-GLES3.functional.transform_feedback.array_element.interleaved.triangles.low
dEQP-GLES3.functional.transform_feedback.array_element.separate.triangles.lowp_mat2x4 dEQP-GLES3.functional.transform_feedback.array_element.separate.triangles.lowp_mat2x4
# Non-sysmem flakes # Non-sysmem flakes
dEQP-VK.pipeline.stencil.format.d24_unorm_s8_uint.states.fail_incc.pass_repl.dfail_decw.comp_not_equal
dEQP-VK.pipeline.stencil.nocolor.format.d24_unorm_s8_uint.states.fail_repl.pass_decc.dfail_repl.comp_always
dEQP-VK.pipeline.spec_constant.compute.composite.matrix.mat3x2 dEQP-VK.pipeline.spec_constant.compute.composite.matrix.mat3x2
# Sysmem flake: this one is fairly frequent, but if you enable it then # Sysmem flake: this one is fairly frequent, but if you enable it then

12
src/freedreno/vulkan/tu_clear_blit.c
View File

@@ -483,8 +483,8 @@ r2d_run(struct tu_cmd_buffer *cmd, struct tu_cs *cs)
/* r3d_ = shader path operations */ /* r3d_ = shader path operations */
static void static void
r3d_pipeline(struct tu_cmd_buffer *cmd, struct tu_cs *cs, bool blit, uint32_t num_rts, r3d_common(struct tu_cmd_buffer *cmd, struct tu_cs *cs, bool blit, uint32_t num_rts,
bool layered_clear) bool layered_clear)
{ {
struct ir3_shader dummy_shader = {}; struct ir3_shader dummy_shader = {};
@@ -700,6 +700,10 @@ r3d_pipeline(struct tu_cmd_buffer *cmd, struct tu_cs *cs, bool blit, uint32_t nu
tu_cs_emit_regs(cs, tu_cs_emit_regs(cs,
A6XX_GRAS_SC_SCREEN_SCISSOR_TL_0(.x = 0, .y = 0), A6XX_GRAS_SC_SCREEN_SCISSOR_TL_0(.x = 0, .y = 0),
A6XX_GRAS_SC_SCREEN_SCISSOR_BR_0(.x = 0x7fff, .y = 0x7fff)); A6XX_GRAS_SC_SCREEN_SCISSOR_BR_0(.x = 0x7fff, .y = 0x7fff));
tu_cs_emit_regs(cs,
A6XX_VFD_INDEX_OFFSET(),
A6XX_VFD_INSTANCE_START_OFFSET());
} }
static void static void
@@ -932,7 +936,7 @@ r3d_setup(struct tu_cmd_buffer *cmd,
tu_cs_emit_regs(cs, A6XX_GRAS_BIN_CONTROL(.dword = 0xc00000)); tu_cs_emit_regs(cs, A6XX_GRAS_BIN_CONTROL(.dword = 0xc00000));
tu_cs_emit_regs(cs, A6XX_RB_BIN_CONTROL(.dword = 0xc00000)); tu_cs_emit_regs(cs, A6XX_RB_BIN_CONTROL(.dword = 0xc00000));
r3d_pipeline(cmd, cs, !clear, clear ? 1 : 0, false); r3d_common(cmd, cs, !clear, clear ? 1 : 0, false);
tu_cs_emit_pkt4(cs, REG_A6XX_SP_FS_OUTPUT_CNTL0, 2); tu_cs_emit_pkt4(cs, REG_A6XX_SP_FS_OUTPUT_CNTL0, 2);
tu_cs_emit(cs, A6XX_SP_FS_OUTPUT_CNTL0_DEPTH_REGID(0xfc) | tu_cs_emit(cs, A6XX_SP_FS_OUTPUT_CNTL0_DEPTH_REGID(0xfc) |
@@ -2092,7 +2096,7 @@ tu_clear_sysmem_attachments(struct tu_cmd_buffer *cmd,
layered_clear = true; layered_clear = true;
} }
r3d_pipeline(cmd, cs, false, num_rts, layered_clear); r3d_common(cmd, cs, false, num_rts, layered_clear);
tu_cs_emit_regs(cs, tu_cs_emit_regs(cs,
A6XX_SP_FS_RENDER_COMPONENTS(.dword = clear_components)); A6XX_SP_FS_RENDER_COMPONENTS(.dword = clear_components));