fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: check for MESA_SHADER_TESS_EVAL in radv_fill_shader_info_ngg()

Browse source 
This seems clearer to me.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27470>
This commit is contained in:
Samuel Pitoiset 2024-02-05 17:36:27 +01:00 • committed by Marge Bot
parent 34572d535e
commit 03314b2a86
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2006,7 +2006,7 @@ radv_fill_shader_info_ngg(struct radv_device *device, struct radv_shader_stage *
stages[MESA_SHADER_GEOMETRY].info.is_ngg = true;
} else {
/* GFX10/GFX10.3 can't always enable NGG due to HW bugs/limitations. */
if (stages[MESA_SHADER_TESS_CTRL].nir && stages[MESA_SHADER_GEOMETRY].nir &&
if (stages[MESA_SHADER_TESS_EVAL].nir && stages[MESA_SHADER_GEOMETRY].nir &&
stages[MESA_SHADER_GEOMETRY].nir->info.gs.invocations *
stages[MESA_SHADER_GEOMETRY].nir->info.gs.vertices_out >
256) {
@ -2028,14 +2028,14 @@ radv_fill_shader_info_ngg(struct radv_device *device, struct radv_shader_stage *
if (last_vgt_stage && last_vgt_stage->nir->xfb_info) {
/* Disable NGG because GFX10/GFX10.3 don't support NGG streamout. */
if (stages[MESA_SHADER_TESS_CTRL].nir)
if (stages[MESA_SHADER_TESS_EVAL].nir)
stages[MESA_SHADER_TESS_EVAL].info.is_ngg = false;
else
stages[MESA_SHADER_VERTEX].info.is_ngg = false;
}
if (stages[MESA_SHADER_GEOMETRY].nir) {
if (stages[MESA_SHADER_TESS_CTRL].nir)
if (stages[MESA_SHADER_TESS_EVAL].nir)
stages[MESA_SHADER_GEOMETRY].info.is_ngg = stages[MESA_SHADER_TESS_EVAL].info.is_ngg;
else
stages[MESA_SHADER_GEOMETRY].info.is_ngg = stages[MESA_SHADER_VERTEX].info.is_ngg;