Mesa (main): radv: move forcing invariant geometry to the graphics pipeline key
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Oct 4 10:22:22 UTC 2021
Module: Mesa
Branch: main
Commit: fb453d80a4226dac9596eec7e350a66383b7c189
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb453d80a4226dac9596eec7e350a66383b7c189
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Wed Sep 29 11:07:02 2021 +0200
radv: move forcing invariant geometry 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 | 5 +++--
src/amd/vulkan/radv_private.h | 1 -
src/amd/vulkan/radv_shader.c | 3 +--
src/amd/vulkan/radv_shader.h | 1 +
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 4330ea0d5b9..d7a514025b2 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -231,8 +231,6 @@ radv_get_hash_flags(const struct radv_device *device, bool stats)
hash_flags |= RADV_HASH_SHADER_LLVM;
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)
- hash_flags |= RADV_HASH_SHADER_INVARIANT_GEOM;
if (stats)
hash_flags |= RADV_HASH_SHADER_KEEP_STATISTICS;
if (device->force_vrs == RADV_FORCE_VRS_2x2)
@@ -2729,6 +2727,9 @@ radv_generate_graphics_pipeline_key(const struct radv_pipeline *pipeline,
if (pipeline->device->instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE)
key.ps.lower_discard_to_demote = true;
+ if (pipeline->device->instance->debug_flags & RADV_DEBUG_INVARIANT_GEOM)
+ key.invariant_geom = true;
+
return key;
}
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 4d13567f39e..2c8595108bd 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1660,7 +1660,6 @@ struct radv_event {
#define RADV_HASH_SHADER_GE_WAVE32 (1 << 3)
#define RADV_HASH_SHADER_LLVM (1 << 4)
#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)
#define RADV_HASH_SHADER_FORCE_VRS_2x2 (1 << 9)
#define RADV_HASH_SHADER_FORCE_VRS_2x1 (1 << 10)
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 52fc044e201..4087dfe8396 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -591,8 +591,7 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module *
NIR_PASS_V(nir, nir_lower_global_vars_to_local);
NIR_PASS_V(nir, nir_lower_vars_to_ssa);
- NIR_PASS_V(nir, nir_propagate_invariant,
- device->instance->debug_flags & RADV_DEBUG_INVARIANT_GEOM);
+ NIR_PASS_V(nir, nir_propagate_invariant, key->invariant_geom);
NIR_PASS_V(nir, nir_lower_clip_cull_distance_arrays);
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index 9b063d3cda9..1d9d2e8e29b 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -50,6 +50,7 @@ struct radv_pipeline_key;
struct radv_pipeline_key {
uint32_t has_multiview_view_index : 1;
uint32_t optimisations_disabled : 1;
+ uint32_t invariant_geom : 1;
struct {
uint32_t instance_rate_inputs;
More information about the mesa-commit
mailing list