From: Rob Clark <robdclark@chromium.org>
Date: Mon, 17 Oct 2022 17:25:10 +0000 (-0700)
Subject: freedreno/ir3: Fix clipvertex with GS+tess
X-Git-Tag: upstream/22.3.5~1487
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b38d233fc55f58b9d5abea94a52066903427cc3;p=platform%2Fupstream%2Fmesa.git

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 <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19100>
---

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;
    }