Mesa (master): turnip: Use hw enum when emitting A6XX_RB_STENCIL_CONTROL

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: fff17707ea959f8fd6098e3a154a8574f4912a85
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fff17707ea959f8fd6098e3a154a8574f4912a85

Author: Kristian H. Kristensen <hoegsberg at google.com>
Date:   Fri May 22 13:56:13 2020 -0700

turnip: Use hw enum when emitting A6XX_RB_STENCIL_CONTROL

We're hard-coding this value, so let's use the hw enum and avoid a
warning.

src/freedreno/vulkan/tu_clear_blit.c:2091:19: warning: implicit
conversion from enumeration type 'enum VkStencilOp' to different
enumeration type 'enum adreno_stencil_op' [-Wenum-conversion]

Reviewed-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5174>

---

 src/freedreno/vulkan/tu_clear_blit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c
index 35a4ccd3fe6..48e49b224d2 100644
--- a/src/freedreno/vulkan/tu_clear_blit.c
+++ b/src/freedreno/vulkan/tu_clear_blit.c
@@ -2088,7 +2088,7 @@ tu_clear_sysmem_attachments(struct tu_cmd_buffer *cmd,
    tu_cs_emit_regs(cs, A6XX_RB_STENCIL_CONTROL(
          .stencil_enable = s_clear,
          .func = FUNC_ALWAYS,
-         .zpass = VK_STENCIL_OP_REPLACE));
+         .zpass = STENCIL_REPLACE));
    tu_cs_emit_regs(cs, A6XX_RB_STENCILMASK(.mask = 0xff));
    tu_cs_emit_regs(cs, A6XX_RB_STENCILWRMASK(.wrmask = 0xff));
    tu_cs_emit_regs(cs, A6XX_RB_STENCILREF(.ref = s_clear_val));