From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Date: Tue, 3 Mar 2020 20:40:37 +0000 (-0800)
Subject: anv: Remove redundant check in flush_descriptor_sets() helpers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d1c13f01aa8f231cd377506b3932e6300f429b79;p=mesa.git

anv: Remove redundant check in flush_descriptor_sets() helpers

These helpers are only called for stages that are active, so the code
for a non-active stage is never executed.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4040>
---

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 17feee27284..0f44cff4001 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -2478,11 +2478,6 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
 
    struct anv_pipeline *pipeline = pipe_state->pipeline;
 
-   if (!anv_pipeline_has_stage(pipeline, stage)) {
-      *bt_state = (struct anv_state) { 0, };
-      return VK_SUCCESS;
-   }
-
    struct anv_pipeline_bind_map *map = &pipeline->shaders[stage]->bind_map;
    if (map->surface_count == 0) {
       *bt_state = (struct anv_state) { 0, };
@@ -2731,11 +2726,6 @@ emit_samplers(struct anv_cmd_buffer *cmd_buffer,
 {
    struct anv_pipeline *pipeline = pipe_state->pipeline;
 
-   if (!anv_pipeline_has_stage(pipeline, stage)) {
-      *state = (struct anv_state) { 0, };
-      return VK_SUCCESS;
-   }
-
    struct anv_pipeline_bind_map *map = &pipeline->shaders[stage]->bind_map;
    if (map->sampler_count == 0) {
       *state = (struct anv_state) { 0, };