gallium: add INVOCATIONID semantic

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c b/src/gallium/auxiliary/tgsi/tgsi_strings.c
index 2be726cdbbf3369c68df25b9234171b86ab21568..5b6e47fc87b695e20e5cfe4427e234bd798476d9 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
@@ -84,7 +84,8 @@ const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT] =
    "CULLDIST",
    "SAMPLEID",
    "SAMPLEPOS",
-   "SAMPLEMASK"
+   "SAMPLEMASK",
+   "INVOCATIONID",
 };
 
 const char *tgsi_texture_names[TGSI_TEXTURE_COUNT] =

diff --git a/src/gallium/docs/source/tgsi.rst b/src/gallium/docs/source/tgsi.rst
index b7d016acb08637c20129b15dd38b5ca9731cd48c..170f83e20acdead8e0b835f4808fba595aa91eb9 100644 (file)
--- a/src/gallium/docs/source/tgsi.rst
+++ b/src/gallium/docs/source/tgsi.rst
@@ -2641,6 +2641,12 @@ For fragment shaders, this semantic label indicates that an output contains
 the sample mask used to disable further sample processing
 (i.e. gl_SampleMask). Only the X value is used, up to 32x MS.
 
+TGSI_SEMANTIC_INVOCATIONID
+""""""""""""""""""""""""""
+
+For geometry shaders, this semantic label indicates that a system value
+contains the current invocation id (i.e. gl_InvocationID). Only the X value is
+used.
 
 Declaration Interpolate
 ^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h
index 74e04756730faf45f818947b6e9b2cf40c7d3e81..1903d5318a1948175cdb998d507d88a2ebe6adee 100644 (file)
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -170,7 +170,8 @@ struct tgsi_declaration_interp
 #define TGSI_SEMANTIC_SAMPLEID   24
 #define TGSI_SEMANTIC_SAMPLEPOS  25
 #define TGSI_SEMANTIC_SAMPLEMASK 26
-#define TGSI_SEMANTIC_COUNT      27 /**< number of semantic values */
+#define TGSI_SEMANTIC_INVOCATIONID 27
+#define TGSI_SEMANTIC_COUNT      28 /**< number of semantic values */
 
 struct tgsi_declaration_semantic
 {