From 79c7c6e492370e9a63813562c963f7b2d32ad235 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Tue, 28 Jun 2022 17:06:01 +0200 Subject: [PATCH] tu: Remove has_subpass_predication The workaround this was used for was removed. Part-of: --- src/freedreno/vulkan/tu_cmd_buffer.c | 5 ----- src/freedreno/vulkan/tu_private.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index cd43c8fb53d..b4c615680a4 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -3373,8 +3373,6 @@ tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, if (secondary->state.has_tess) { cmd->state.has_tess = true; } - if (secondary->state.has_subpass_predication) - cmd->state.has_subpass_predication = true; if (secondary->state.disable_gmem) cmd->state.disable_gmem = true; @@ -4834,7 +4832,6 @@ tu_end_rendering(struct tu_cmd_buffer *cmd_buffer) cmd_buffer->state.framebuffer = NULL; cmd_buffer->state.attachments = NULL; cmd_buffer->state.has_tess = false; - cmd_buffer->state.has_subpass_predication = false; cmd_buffer->state.xfb_used = false; cmd_buffer->state.disable_gmem = false; cmd_buffer->state.drawcall_count = 0; @@ -5085,8 +5082,6 @@ tu_CmdBeginConditionalRenderingEXT(VkCommandBuffer commandBuffer, TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); cmd->state.predication_active = true; - if (cmd->state.pass) - cmd->state.has_subpass_predication = true; struct tu_cs *cs = cmd->state.pass ? &cmd->draw_cs : &cmd->cs; diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index f835874bcf7..d73a8344164 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -1364,7 +1364,6 @@ struct tu_cmd_state bool xfb_used; bool has_tess; bool tessfactor_addr_set; - bool has_subpass_predication; bool predication_active; bool disable_gmem; enum a5xx_line_mode line_mode;