fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: move forcing discard to demote 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:01:31 +02:00 • committed by Marge Bot
parent 38c34bf132
commit 421b5379df
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/amd/vulkan/radv_pipeline.c
View file

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

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

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

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

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

2
src/amd/vulkan/radv_shader.h
View file

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