Mesa (main): radv: move forcing discard to demote to the graphics pipeline key

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 421b5379dfd2c714d0726eb0a2367bb98f422b4c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=421b5379dfd2c714d0726eb0a2367bb98f422b4c

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Sep 29 11:01:31 2021 +0200

radv: move forcing discard to demote to the graphics pipeline key

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13099>

---

 src/amd/vulkan/radv_pipeline.c | 6 ++++--
 src/amd/vulkan/radv_private.h  | 1 -
 src/amd/vulkan/radv_shader.c   | 3 +--
 src/amd/vulkan/radv_shader.h   | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 89337d531fc..4330ea0d5b9 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -229,8 +229,6 @@ radv_get_hash_flags(const struct radv_device *device, bool stats)
       hash_flags |= RADV_HASH_SHADER_GE_WAVE32;
    if (device->physical_device->use_llvm)
       hash_flags |= RADV_HASH_SHADER_LLVM;
-   if (device->instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE)
-      hash_flags |= RADV_HASH_SHADER_DISCARD_TO_DEMOTE;
    if (device->instance->enable_mrt_output_nan_fixup)
       hash_flags |= RADV_HASH_SHADER_MRT_NAN_FIXUP;
    if (device->instance->debug_flags & RADV_DEBUG_INVARIANT_GEOM)
@@ -2727,6 +2725,10 @@ radv_generate_graphics_pipeline_key(const struct radv_pipeline *pipeline,
          key.vs.provoking_vtx_last = true;
       }
    }
+
+   if (pipeline->device->instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE)
+      key.ps.lower_discard_to_demote = true;
+
    return key;
 }
 
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 7a8685775ce..4d13567f39e 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1659,7 +1659,6 @@ struct radv_event {
 #define RADV_HASH_SHADER_PS_WAVE32         (1 << 2)
 #define RADV_HASH_SHADER_GE_WAVE32         (1 << 3)
 #define RADV_HASH_SHADER_LLVM              (1 << 4)
-#define RADV_HASH_SHADER_DISCARD_TO_DEMOTE (1 << 5)
 #define RADV_HASH_SHADER_MRT_NAN_FIXUP     (1 << 6)
 #define RADV_HASH_SHADER_INVARIANT_GEOM    (1 << 7)
 #define RADV_HASH_SHADER_KEEP_STATISTICS   (1 << 8)
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index fc1953e05f2..52fc044e201 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -596,8 +596,7 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module *
 
       NIR_PASS_V(nir, nir_lower_clip_cull_distance_arrays);
 
-      NIR_PASS_V(nir, nir_lower_discard_or_demote,
-                 device->instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE);
+      NIR_PASS_V(nir, nir_lower_discard_or_demote, key->ps.lower_discard_to_demote);
 
       nir_lower_doubles_options lower_doubles = nir->options->lower_doubles_options;
 
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index ae810e63adb..9b063d3cda9 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -75,6 +75,8 @@ struct radv_pipeline_key {
       uint32_t is_int10;
       uint8_t log2_ps_iter_samples;
       uint8_t num_samples;
+
+      bool lower_discard_to_demote;
    } ps;
 
    struct {