From 1b38d233fc55f58b9d5abea94a52066903427cc3 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 17 Oct 2022 10:25:10 -0700 Subject: [PATCH] freedreno/ir3: Fix clipvertex with GS+tess If we have both GS and tess, GS is the stage we should run lower_clip_vs on. Signed-off-by: Rob Clark Part-of: --- src/freedreno/ir3/ir3_nir.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c index f9a35d3..8cc2920 100644 --- a/src/freedreno/ir3/ir3_nir.c +++ b/src/freedreno/ir3/ir3_nir.c @@ -647,12 +647,12 @@ lower_ucp_vs(struct ir3_shader_variant *so) if (!so->key.ucp_enables) return false; - gl_shader_stage last_geom_stage = MESA_SHADER_VERTEX; + gl_shader_stage last_geom_stage; - if (so->key.tessellation) { - last_geom_stage = MESA_SHADER_TESS_EVAL; - } else if (so->key.has_gs) { + if (so->key.has_gs) { last_geom_stage = MESA_SHADER_GEOMETRY; + } else if (so->key.tessellation) { + last_geom_stage = MESA_SHADER_TESS_EVAL; } else { last_geom_stage = MESA_SHADER_VERTEX; } -- 2.7.4