radv: remove remaining discard to demote options

This is the default but the option wasn't completely removed.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32590>
This commit is contained in:
Samuel Pitoiset 2024-12-11 14:38:10 +01:00 committed by Marge Bot
parent 97fc987497
commit 167f4a87c6
3 changed files with 38 additions and 41 deletions

View file

@ -32,45 +32,44 @@ enum {
RADV_DEBUG_NOBINNING = 1ull << 17,
RADV_DEBUG_NO_NGG = 1ull << 18,
RADV_DEBUG_DUMP_META_SHADERS = 1ull << 19,
RADV_DEBUG_DISCARD_TO_DEMOTE = 1ull << 20,
RADV_DEBUG_LLVM = 1ull << 21,
RADV_DEBUG_FORCE_COMPRESS = 1ull << 22,
RADV_DEBUG_HANG = 1ull << 23,
RADV_DEBUG_IMG = 1ull << 24,
RADV_DEBUG_NO_UMR = 1ull << 25,
RADV_DEBUG_INVARIANT_GEOM = 1ull << 26,
RADV_DEBUG_NO_DISPLAY_DCC = 1ull << 27,
RADV_DEBUG_NO_TC_COMPAT_CMASK = 1ull << 28,
RADV_DEBUG_NO_VRS_FLAT_SHADING = 1ull << 29,
RADV_DEBUG_NO_ATOC_DITHERING = 1ull << 30,
RADV_DEBUG_NO_NGGC = 1ull << 31,
RADV_DEBUG_DUMP_PROLOGS = 1ull << 32,
RADV_DEBUG_NO_DMA_BLIT = 1ull << 33,
RADV_DEBUG_SPLIT_FMA = 1ull << 34,
RADV_DEBUG_DUMP_EPILOGS = 1ull << 35,
RADV_DEBUG_NO_FMASK = 1ull << 36,
RADV_DEBUG_SHADOW_REGS = 1ull << 37,
RADV_DEBUG_EXTRA_MD = 1ull << 38,
RADV_DEBUG_NO_GPL = 1ull << 39,
RADV_DEBUG_VIDEO_ARRAY_PATH = 1ull << 40,
RADV_DEBUG_NO_RT = 1ull << 41,
RADV_DEBUG_NO_MESH_SHADER = 1ull << 42,
RADV_DEBUG_NO_NGG_GS = 1ull << 43,
RADV_DEBUG_NO_ESO = 1ull << 44,
RADV_DEBUG_PSO_CACHE_STATS = 1ull << 45,
RADV_DEBUG_NIR_DEBUG_INFO = 1ull << 46,
RADV_DEBUG_DUMP_TRAP_HANDLER = 1ull << 47,
RADV_DEBUG_DUMP_VS = 1ull << 48,
RADV_DEBUG_DUMP_TCS = 1ull << 49,
RADV_DEBUG_DUMP_TES = 1ull << 50,
RADV_DEBUG_DUMP_GS = 1ull << 51,
RADV_DEBUG_DUMP_PS = 1ull << 52,
RADV_DEBUG_DUMP_TASK = 1ull << 53,
RADV_DEBUG_DUMP_MESH = 1ull << 54,
RADV_DEBUG_DUMP_CS = 1ull << 55,
RADV_DEBUG_DUMP_NIR = 1ull << 56,
RADV_DEBUG_DUMP_ASM = 1ull << 57,
RADV_DEBUG_DUMP_BACKEND_IR = 1ull << 58,
RADV_DEBUG_LLVM = 1ull << 20,
RADV_DEBUG_FORCE_COMPRESS = 1ull << 21,
RADV_DEBUG_HANG = 1ull << 22,
RADV_DEBUG_IMG = 1ull << 23,
RADV_DEBUG_NO_UMR = 1ull << 24,
RADV_DEBUG_INVARIANT_GEOM = 1ull << 25,
RADV_DEBUG_NO_DISPLAY_DCC = 1ull << 26,
RADV_DEBUG_NO_TC_COMPAT_CMASK = 1ull << 27,
RADV_DEBUG_NO_VRS_FLAT_SHADING = 1ull << 28,
RADV_DEBUG_NO_ATOC_DITHERING = 1ull << 29,
RADV_DEBUG_NO_NGGC = 1ull << 30,
RADV_DEBUG_DUMP_PROLOGS = 1ull << 31,
RADV_DEBUG_NO_DMA_BLIT = 1ull << 32,
RADV_DEBUG_SPLIT_FMA = 1ull << 33,
RADV_DEBUG_DUMP_EPILOGS = 1ull << 34,
RADV_DEBUG_NO_FMASK = 1ull << 35,
RADV_DEBUG_SHADOW_REGS = 1ull << 36,
RADV_DEBUG_EXTRA_MD = 1ull << 37,
RADV_DEBUG_NO_GPL = 1ull << 38,
RADV_DEBUG_VIDEO_ARRAY_PATH = 1ull << 39,
RADV_DEBUG_NO_RT = 1ull << 40,
RADV_DEBUG_NO_MESH_SHADER = 1ull << 41,
RADV_DEBUG_NO_NGG_GS = 1ull << 42,
RADV_DEBUG_NO_ESO = 1ull << 43,
RADV_DEBUG_PSO_CACHE_STATS = 1ull << 44,
RADV_DEBUG_NIR_DEBUG_INFO = 1ull << 45,
RADV_DEBUG_DUMP_TRAP_HANDLER = 1ull << 46,
RADV_DEBUG_DUMP_VS = 1ull << 47,
RADV_DEBUG_DUMP_TCS = 1ull << 48,
RADV_DEBUG_DUMP_TES = 1ull << 49,
RADV_DEBUG_DUMP_GS = 1ull << 50,
RADV_DEBUG_DUMP_PS = 1ull << 51,
RADV_DEBUG_DUMP_TASK = 1ull << 52,
RADV_DEBUG_DUMP_MESH = 1ull << 53,
RADV_DEBUG_DUMP_CS = 1ull << 54,
RADV_DEBUG_DUMP_NIR = 1ull << 55,
RADV_DEBUG_DUMP_ASM = 1ull << 56,
RADV_DEBUG_DUMP_BACKEND_IR = 1ull << 57,
RADV_DEBUG_DUMP_SHADERS = RADV_DEBUG_DUMP_VS | RADV_DEBUG_DUMP_TCS | RADV_DEBUG_DUMP_TES | RADV_DEBUG_DUMP_GS |
RADV_DEBUG_DUMP_PS | RADV_DEBUG_DUMP_TASK | RADV_DEBUG_DUMP_MESH | RADV_DEBUG_DUMP_CS |
RADV_DEBUG_DUMP_NIR | RADV_DEBUG_DUMP_ASM | RADV_DEBUG_DUMP_BACKEND_IR,

View file

@ -222,7 +222,6 @@ radv_physical_device_init_cache_key(struct radv_physical_device *pdev)
key->emulate_rt = !!(instance->perftest_flags & RADV_PERFTEST_EMULATE_RT);
key->ge_wave32 = pdev->ge_wave_size == 32;
key->invariant_geom = !!(instance->debug_flags & RADV_DEBUG_INVARIANT_GEOM);
key->lower_discard_to_demote = !!(instance->debug_flags & RADV_DEBUG_DISCARD_TO_DEMOTE);
key->no_fmask = !!(instance->debug_flags & RADV_DEBUG_NO_FMASK);
key->no_ngg_gs = !!(instance->debug_flags & RADV_DEBUG_NO_NGG_GS);
key->no_rt = !!(instance->debug_flags & RADV_DEBUG_NO_RT);

View file

@ -53,7 +53,6 @@ struct radv_physical_device_cache_key {
uint32_t emulate_rt : 1;
uint32_t ge_wave32 : 1;
uint32_t invariant_geom : 1;
uint32_t lower_discard_to_demote : 1;
uint32_t no_fmask : 1;
uint32_t no_ngg_gs : 1;
uint32_t no_rt : 1;