From 957a1add264b2d9b2c59941b6c1996e7f183c237 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 4 Oct 2024 20:05:35 -0500 Subject: [PATCH] nak: Rename SV_VERTEX_COUNT to PRIM_TYPE This is what nvdisasm calls it. Part-of: --- src/nouveau/compiler/nak_nir.c | 4 ++-- src/nouveau/compiler/nak_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c index 05627c3a41b..a610128077c 100644 --- a/src/nouveau/compiler/nak_nir.c +++ b/src/nouveau/compiler/nak_nir.c @@ -401,7 +401,7 @@ nak_sysval_sysval_idx(gl_system_value sysval) { switch (sysval) { case SYSTEM_VALUE_SUBGROUP_INVOCATION: return NAK_SV_LANE_ID; - case SYSTEM_VALUE_VERTICES_IN: return NAK_SV_VERTEX_COUNT; + case SYSTEM_VALUE_VERTICES_IN: return NAK_SV_PRIM_TYPE; case SYSTEM_VALUE_INVOCATION_ID: return NAK_SV_INVOCATION_ID; case SYSTEM_VALUE_HELPER_INVOCATION: return NAK_SV_THREAD_KILL; case SYSTEM_VALUE_LOCAL_INVOCATION_ID: return NAK_SV_TID; @@ -443,7 +443,7 @@ nak_nir_lower_system_value_intrin(nir_builder *b, nir_intrinsic_instr *intrin, } case nir_intrinsic_load_patch_vertices_in: { - val = nir_load_sysval_nv(b, 32, .base = NAK_SV_VERTEX_COUNT, + val = nir_load_sysval_nv(b, 32, .base = NAK_SV_PRIM_TYPE, .access = ACCESS_CAN_REORDER); val = nir_extract_u8(b, val, nir_imm_int(b, 1)); break; diff --git a/src/nouveau/compiler/nak_private.h b/src/nouveau/compiler/nak_private.h index bbb23b9098c..141eb8f34ec 100644 --- a/src/nouveau/compiler/nak_private.h +++ b/src/nouveau/compiler/nak_private.h @@ -100,7 +100,7 @@ enum ENUM_PACKED nak_sv { NAK_SV_LANE_ID = 0x00, NAK_SV_VIRTCFG = 0x02, NAK_SV_VIRTID = 0x03, - NAK_SV_VERTEX_COUNT = 0x10, + NAK_SV_PRIM_TYPE = 0x10, NAK_SV_INVOCATION_ID = 0x11, NAK_SV_THREAD_KILL = 0x13, NAK_SV_INVOCATION_INFO = 0x1d,