OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: move forcing invariant geometry to the graphics pipeline key

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13099>
This commit is contained in:
Samuel Pitoiset
2021-09-29 11:07:02 +02:00
committed by Marge Bot
parent 421b5379df
commit fb453d80a4
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/amd/vulkan/radv_pipeline.c
View File

@@ -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;
}

1
src/amd/vulkan/radv_private.h
View File

@@ -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)

3
src/amd/vulkan/radv_shader.c
View File

@@ -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);

1
src/amd/vulkan/radv_shader.h
View File

@@ -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;