From: Rhys Perry <pendingchaos02@gmail.com>
Date: Mon, 14 Oct 2019 16:03:07 +0000 (+0100)
Subject: nir/divergence: handle load_primitive_id in GS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9fb0c2e0335716a46ce98bcb6979198d5862ae44;p=mesa.git

nir/divergence: handle load_primitive_id in GS

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2323>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2323>
---

diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 9b8f9cb6349..397015263e1 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -157,6 +157,8 @@ visit_intrinsic(bool *divergent, nir_intrinsic_instr *instr,
          is_divergent = !(options & nir_divergence_single_patch_per_tcs_subgroup);
       else if (stage == MESA_SHADER_TESS_EVAL)
          is_divergent = !(options & nir_divergence_single_patch_per_tes_subgroup);
+      else if (stage == MESA_SHADER_GEOMETRY)
+         is_divergent = true;
       else
          unreachable("Invalid stage for load_primitive_id");
       break;