From 7cfb8cb1a5880169c30e258c3e53593fd13ad77b Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Sat, 5 Nov 2022 13:20:33 +0100
Subject: [PATCH] nv50/ir: ignore CL system values

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19712>
---
 src/nouveau/codegen/nv50_ir_from_nir.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/nouveau/codegen/nv50_ir_from_nir.cpp b/src/nouveau/codegen/nv50_ir_from_nir.cpp
index e12e6c84f9a..4801d42f18a 100644
--- a/src/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -1029,9 +1029,15 @@ bool Converter::assignSlots() {
 
    uint8_t i;
    BITSET_FOREACH_SET(i, nir->info.system_values_read, SYSTEM_VALUE_MAX) {
-      info_out->sv[info_out->numSysVals].sn = tgsi_get_sysval_semantic(i);
-      info_out->sv[info_out->numSysVals].si = 0;
-      info_out->sv[info_out->numSysVals].input = 0;
+      switch (i) {
+      case SYSTEM_VALUE_BASE_GLOBAL_INVOCATION_ID:
+         continue;
+      default:
+         info_out->sv[info_out->numSysVals].sn = tgsi_get_sysval_semantic(i);
+         info_out->sv[info_out->numSysVals].si = 0;
+         info_out->sv[info_out->numSysVals].input = 0;
+         break;
+      }
 
       switch (i) {
       case SYSTEM_VALUE_VERTEX_ID: