diff --git a/docs/envvars.rst b/docs/envvars.rst index 3cb8bba645a..6d3b9d5a960 100644 --- a/docs/envvars.rst +++ b/docs/envvars.rst @@ -1366,8 +1366,6 @@ RADV driver environment variables disable FMASK compression on MSAA images (GFX6-GFX10.3) ``nogpl`` disable VK_EXT_graphics_pipeline_library - ``nogsfastlaunch2`` - disable GS_FAST_LAUNCH=2 for Mesh shaders (GFX11 only) ``nohiz`` disable HIZ for depthstencil images ``noibs`` diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h index ea10b7cf5a1..596b772138c 100644 --- a/src/amd/vulkan/radv_debug.h +++ b/src/amd/vulkan/radv_debug.h @@ -57,9 +57,8 @@ enum { RADV_DEBUG_NO_RT = 1ull << 41, RADV_DEBUG_NO_MESH_SHADER = 1ull << 42, RADV_DEBUG_NO_NGG_GS = 1ull << 43, - RADV_DEBUG_NO_GS_FAST_LAUNCH_2 = 1ull << 44, - RADV_DEBUG_NO_ESO = 1ull << 45, - RADV_DEBUG_PSO_CACHE_STATS = 1ull << 46, + RADV_DEBUG_NO_ESO = 1ull << 44, + RADV_DEBUG_PSO_CACHE_STATS = 1ull << 45, }; enum { diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index 80568d0f9f4..685b4c7a1d2 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -70,7 +70,6 @@ static const struct debug_control radv_debug_options[] = {{"nofastclears", RADV_ {"nort", RADV_DEBUG_NO_RT}, {"nomeshshader", RADV_DEBUG_NO_MESH_SHADER}, {"nongg_gs", RADV_DEBUG_NO_NGG_GS}, - {"nogsfastlaunch2", RADV_DEBUG_NO_GS_FAST_LAUNCH_2}, {"noeso", RADV_DEBUG_NO_ESO}, {"psocachestats", RADV_DEBUG_PSO_CACHE_STATS}, {NULL, 0}}; diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index ebdcec2fc36..abe0910e326 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -165,7 +165,6 @@ radv_physical_device_init_cache_key(struct radv_physical_device *pdev) 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->mesh_fast_launch_2 = pdev->mesh_fast_launch_2; 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); @@ -2098,9 +2097,7 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm pdev->emulate_ngg_gs_query_pipeline_stat = pdev->use_ngg && pdev->info.gfx_level < GFX11; - pdev->mesh_fast_launch_2 = - (pdev->info.gfx_level >= GFX11 && !(instance->debug_flags & RADV_DEBUG_NO_GS_FAST_LAUNCH_2)) || - pdev->info.gfx_level >= GFX12; + pdev->mesh_fast_launch_2 = pdev->info.gfx_level >= GFX11; pdev->emulate_mesh_shader_queries = pdev->info.gfx_level == GFX10_3; diff --git a/src/amd/vulkan/radv_physical_device.h b/src/amd/vulkan/radv_physical_device.h index c8d288346cf..d1a6163b913 100644 --- a/src/amd/vulkan/radv_physical_device.h +++ b/src/amd/vulkan/radv_physical_device.h @@ -55,7 +55,6 @@ struct radv_physical_device_cache_key { uint32_t ge_wave32 : 1; uint32_t invariant_geom : 1; uint32_t lower_discard_to_demote : 1; - uint32_t mesh_fast_launch_2 : 1; uint32_t no_fmask : 1; uint32_t no_ngg_gs : 1; uint32_t no_rt : 1;