diff --git a/docs/envvars.rst b/docs/envvars.rst index ad37e191579..6fbf8e6bc03 100644 --- a/docs/envvars.rst +++ b/docs/envvars.rst @@ -1395,9 +1395,6 @@ RADV driver environment variables Print image info ``info`` show GPU-related information - ``invariantgeom`` - Mark geometry-affecting outputs as invariant. This works around a common - class of application bugs appearing as flickering. (deprecated) ``metashaders`` dump internal meta shaders ``noatocdithering`` @@ -1414,8 +1411,6 @@ RADV driver environment variables disable Delta Color Compression (DCC) on images ``nodisplaydcc`` disable Delta Color Compression (DCC) on displayable images - ``nodynamicbounds`` - do not check OOB access for dynamic descriptors (deprecated) ``noeso`` disable VK_EXT_shader_object ``nofastclears`` @@ -1434,8 +1429,6 @@ RADV driver environment variables disable NGG for GFX10 and GFX10.3 ``nonggc`` disable NGG culling for GFX10 and GFX10.3 - ``nongg_gs`` - disable NGG GS for GFX10 and GFX10.3 (deprecated) ``nort`` skip executing vkCmdTraceRays and ray queries (RT extensions will still be advertised) @@ -1465,9 +1458,6 @@ RADV driver environment variables enable register shadowing ``spirv`` dump SPIR-V - ``splitfma`` - split application-provided fused multiply-add in geometry stages - (deprecated) ``startup`` display info at startup ``syncshaders`` diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h index f3c700307d3..4c54ea23625 100644 --- a/src/amd/vulkan/radv_debug.h +++ b/src/amd/vulkan/radv_debug.h @@ -25,57 +25,53 @@ enum { RADV_DEBUG_ZERO_VRAM = 1ull << 10, RADV_DEBUG_SYNC_SHADERS = 1ull << 11, RADV_DEBUG_DUMP_PREOPT_IR = 1ull << 12, - RADV_DEBUG_NO_DYNAMIC_BOUNDS = 1ull << 13, /* deprecated */ - RADV_DEBUG_INFO = 1ull << 14, - RADV_DEBUG_STARTUP = 1ull << 15, - RADV_DEBUG_CHECKIR = 1ull << 16, - RADV_DEBUG_NOBINNING = 1ull << 17, - RADV_DEBUG_NO_NGG = 1ull << 18, - RADV_DEBUG_DUMP_META_SHADERS = 1ull << 19, - 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, /* deprecated */ - 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, /* deprecated */ - 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, /* deprecated */ - 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_PSO_HISTORY = 1ull << 58, - RADV_DEBUG_BVH4 = 1ull << 59, - RADV_DEBUG_NO_VIDEO = 1ull << 60, - RADV_DEBUG_VALIDATE_VAS = 1ull << 61, - RADV_DEBUG_DUMP_BO_HISTORY = 1ull << 62, - RADV_DEBUG_NO_BO_LIST = 1ull << 63, + RADV_DEBUG_INFO = 1ull << 13, + RADV_DEBUG_STARTUP = 1ull << 14, + RADV_DEBUG_CHECKIR = 1ull << 15, + RADV_DEBUG_NOBINNING = 1ull << 16, + RADV_DEBUG_NO_NGG = 1ull << 17, + RADV_DEBUG_DUMP_META_SHADERS = 1ull << 18, + RADV_DEBUG_LLVM = 1ull << 19, + RADV_DEBUG_FORCE_COMPRESS = 1ull << 20, + RADV_DEBUG_HANG = 1ull << 21, + RADV_DEBUG_IMG = 1ull << 22, + RADV_DEBUG_NO_UMR = 1ull << 23, + RADV_DEBUG_NO_DISPLAY_DCC = 1ull << 24, + RADV_DEBUG_NO_TC_COMPAT_CMASK = 1ull << 25, + RADV_DEBUG_NO_VRS_FLAT_SHADING = 1ull << 26, + RADV_DEBUG_NO_ATOC_DITHERING = 1ull << 27, + RADV_DEBUG_NO_NGGC = 1ull << 28, + RADV_DEBUG_DUMP_PROLOGS = 1ull << 29, + RADV_DEBUG_NO_DMA_BLIT = 1ull << 30, + RADV_DEBUG_DUMP_EPILOGS = 1ull << 31, + RADV_DEBUG_NO_FMASK = 1ull << 32, + RADV_DEBUG_SHADOW_REGS = 1ull << 33, + RADV_DEBUG_EXTRA_MD = 1ull << 34, + RADV_DEBUG_NO_GPL = 1ull << 35, + RADV_DEBUG_VIDEO_ARRAY_PATH = 1ull << 36, + RADV_DEBUG_NO_RT = 1ull << 37, + RADV_DEBUG_NO_MESH_SHADER = 1ull << 38, + RADV_DEBUG_NO_ESO = 1ull << 39, + RADV_DEBUG_PSO_CACHE_STATS = 1ull << 40, + RADV_DEBUG_NIR_DEBUG_INFO = 1ull << 41, + RADV_DEBUG_DUMP_TRAP_HANDLER = 1ull << 42, + RADV_DEBUG_DUMP_VS = 1ull << 43, + RADV_DEBUG_DUMP_TCS = 1ull << 44, + RADV_DEBUG_DUMP_TES = 1ull << 45, + RADV_DEBUG_DUMP_GS = 1ull << 46, + RADV_DEBUG_DUMP_PS = 1ull << 47, + RADV_DEBUG_DUMP_TASK = 1ull << 48, + RADV_DEBUG_DUMP_MESH = 1ull << 49, + RADV_DEBUG_DUMP_CS = 1ull << 50, + RADV_DEBUG_DUMP_NIR = 1ull << 51, + RADV_DEBUG_DUMP_ASM = 1ull << 52, + RADV_DEBUG_DUMP_BACKEND_IR = 1ull << 53, + RADV_DEBUG_PSO_HISTORY = 1ull << 54, + RADV_DEBUG_BVH4 = 1ull << 55, + RADV_DEBUG_NO_VIDEO = 1ull << 56, + RADV_DEBUG_VALIDATE_VAS = 1ull << 57, + RADV_DEBUG_DUMP_BO_HISTORY = 1ull << 58, + RADV_DEBUG_NO_BO_LIST = 1ull << 59, 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, diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index 41541d8c5a8..6769e33f63d 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -40,7 +40,6 @@ static const struct debug_control radv_debug_options[] = {{"nofastclears", RADV_ {"zerovram", RADV_DEBUG_ZERO_VRAM}, {"syncshaders", RADV_DEBUG_SYNC_SHADERS}, {"preoptir", RADV_DEBUG_DUMP_PREOPT_IR}, - {"nodynamicbounds", RADV_DEBUG_NO_DYNAMIC_BOUNDS}, {"info", RADV_DEBUG_INFO}, {"startup", RADV_DEBUG_STARTUP}, {"checkir", RADV_DEBUG_CHECKIR}, @@ -52,8 +51,6 @@ static const struct debug_control radv_debug_options[] = {{"nofastclears", RADV_ {"hang", RADV_DEBUG_HANG}, {"img", RADV_DEBUG_IMG}, {"noumr", RADV_DEBUG_NO_UMR}, - {"invariantgeom", RADV_DEBUG_INVARIANT_GEOM}, - {"splitfma", RADV_DEBUG_SPLIT_FMA}, {"nodisplaydcc", RADV_DEBUG_NO_DISPLAY_DCC}, {"notccompatcmask", RADV_DEBUG_NO_TC_COMPAT_CMASK}, {"novrsflatshading", RADV_DEBUG_NO_VRS_FLAT_SHADING}, @@ -69,7 +66,6 @@ static const struct debug_control radv_debug_options[] = {{"nofastclears", RADV_ {"videoarraypath", RADV_DEBUG_VIDEO_ARRAY_PATH}, {"nort", RADV_DEBUG_NO_RT}, {"nomeshshader", RADV_DEBUG_NO_MESH_SHADER}, - {"nongg_gs", RADV_DEBUG_NO_NGG_GS}, {"noeso", RADV_DEBUG_NO_ESO}, {"psocachestats", RADV_DEBUG_PSO_CACHE_STATS}, {"nirdebuginfo", RADV_DEBUG_NIR_DEBUG_INFO}, @@ -440,31 +436,6 @@ radv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationC radv_init_dri_options(instance); - /* Handle deprecated RADV_DEBUG options. */ - if (instance->debug_flags & RADV_DEBUG_NO_DYNAMIC_BOUNDS) { - fprintf(stderr, "radv: RADV_DEBUG=nodynamicbounds is deprecated and will it be removed in future Mesa releases. " - "Please use radv_no_dynamic_bounds=true instead.\n"); - instance->drirc.debug.no_dynamic_bounds = true; - } - - if (instance->debug_flags & RADV_DEBUG_INVARIANT_GEOM) { - fprintf(stderr, "radv: RADV_DEBUG=invariantgeom is deprecated and will it be removed in future Mesa releases. " - "Please use radv_invariant_geom=true instead.\n"); - instance->drirc.debug.invariant_geom = true; - } - - if (instance->debug_flags & RADV_DEBUG_SPLIT_FMA) { - fprintf(stderr, "radv: RADV_DEBUG=splitfma is deprecated and will it be removed in future Mesa releases. " - "Please use radv_split_fma=true instead.\n"); - instance->drirc.debug.split_fma = true; - } - - if (instance->debug_flags & RADV_DEBUG_NO_NGG_GS) { - fprintf(stderr, "radv: RADV_DEBUG=nongg_gs is deprecated and will it be removed in future Mesa releases. " - "Please use radv_disable_ngg_gs=true instead.\n"); - instance->drirc.performance.disable_ngg_gs = true; - } - *pInstance = radv_instance_to_handle(instance); return VK_SUCCESS;