From abaaf0b2e731ad4f10ffb2b6b5ae3d5b12d4cc12 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Fri, 22 Nov 2019 18:12:11 -0500 Subject: [PATCH] turnip: don't set unused BLIT_DST_INFO bits for GMEM clear These bits are ignored when clearing so don't bother setting them. Note: MSAA samples when clearing comes from other registers (tu6_emit_msaa) Signed-off-by: Jonathan Marek Reviewed-by: Eric Anholt --- src/freedreno/vulkan/tu_cmd_buffer.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index 9e69b918fe9..6ad18f18aa7 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -664,14 +664,9 @@ tu6_emit_blit_clear(struct tu_cmd_buffer *cmd, const struct tu_native_format *format = tu6_get_native_format(iview->vk_format); assert(format && format->rb >= 0); - /* must be WZYX; other values are ignored */ - const enum a3xx_color_swap swap = WZYX; tu_cs_emit_pkt4(cs, REG_A6XX_RB_BLIT_DST_INFO, 1); - tu_cs_emit(cs, A6XX_RB_BLIT_DST_INFO_TILE_MODE(TILE6_LINEAR) | - A6XX_RB_BLIT_DST_INFO_SAMPLES(tu_msaa_samples(iview->image->samples)) | - A6XX_RB_BLIT_DST_INFO_COLOR_FORMAT(format->rb) | - A6XX_RB_BLIT_DST_INFO_COLOR_SWAP(swap)); + tu_cs_emit(cs, A6XX_RB_BLIT_DST_INFO_COLOR_FORMAT(format->rb)); tu_cs_emit_pkt4(cs, REG_A6XX_RB_BLIT_INFO, 1); tu_cs_emit(cs, A6XX_RB_BLIT_INFO_GMEM | A6XX_RB_BLIT_INFO_CLEAR_MASK(0xf)); @@ -682,7 +677,6 @@ tu6_emit_blit_clear(struct tu_cmd_buffer *cmd, tu_cs_emit_pkt4(cs, REG_A6XX_RB_UNKNOWN_88D0, 1); tu_cs_emit(cs, 0); - /* pack clear_value into WZYX order */ uint32_t clear_vals[4] = { 0 }; tu_pack_clear_value(clear_value, iview->vk_format, clear_vals);