From fab87b0f4115bd360ed9334aa7a72518613c2014 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 3 Nov 2022 09:53:40 +0100 Subject: [PATCH] radv: fix fallback for extreme geometry with tessellation on GFX11 It would assert anyways. Found by inspection. Cc: 22.3 mesa-stable Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_pipeline.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 8fe7b52465f..6280eb8d73c 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -2906,7 +2906,8 @@ radv_fill_shader_info_ngg(struct radv_pipeline *pipeline, stages[MESA_SHADER_MESH].info.is_ngg = true; } - if (stages[MESA_SHADER_TESS_CTRL].nir && stages[MESA_SHADER_GEOMETRY].nir && + if (device->physical_device->rad_info.gfx_level < GFX11 && + stages[MESA_SHADER_TESS_CTRL].nir && stages[MESA_SHADER_GEOMETRY].nir && stages[MESA_SHADER_GEOMETRY].nir->info.gs.invocations * stages[MESA_SHADER_GEOMETRY].nir->info.gs.vertices_out > 256) { @@ -2916,9 +2917,6 @@ radv_fill_shader_info_ngg(struct radv_pipeline *pipeline, * might hang. */ stages[MESA_SHADER_TESS_EVAL].info.is_ngg = false; - - /* GFX11+ requires NGG. */ - assert(device->physical_device->rad_info.gfx_level < GFX11); } gl_shader_stage last_xfb_stage = MESA_SHADER_VERTEX;