Mesa (master): glsl: add gl_InvocationID variable for ARB_gpu_shader5

Jordan Justen jljusten at kemper.freedesktop.org
Thu Feb 20 19:19:39 UTC 2014


Module: Mesa
Branch: master
Commit: d09901993539385c015c6389310c186cba9bb263
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d09901993539385c015c6389310c186cba9bb263

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Sat Jan 25 12:43:26 2014 -0800

glsl: add gl_InvocationID variable for ARB_gpu_shader5

v2:
 * Make gl_InvocationID a system value

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

 src/glsl/builtin_variables.cpp |    2 ++
 src/mesa/main/mtypes.h         |    1 +
 2 files changed, 3 insertions(+)

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 2fa509f..4176ae6 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -854,6 +854,8 @@ builtin_variable_generator::generate_gs_special_vars()
    add_output(VARYING_SLOT_LAYER, int_t, "gl_Layer");
    if (state->ARB_viewport_array_enable)
       add_output(VARYING_SLOT_VIEWPORT, int_t, "gl_ViewportIndex");
+   if (state->ARB_gpu_shader5_enable)
+      add_system_value(SYSTEM_VALUE_INVOCATION_ID, int_t, "gl_InvocationID");
 
    /* Although gl_PrimitiveID appears in tessellation control and tessellation
     * evaluation shaders, it has a different function there than it has in
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bc02969..4c5f028 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2013,6 +2013,7 @@ typedef enum
    SYSTEM_VALUE_SAMPLE_ID,      /**< Fragment shader only */
    SYSTEM_VALUE_SAMPLE_POS,     /**< Fragment shader only */
    SYSTEM_VALUE_SAMPLE_MASK_IN, /**< Fragment shader only */
+   SYSTEM_VALUE_INVOCATION_ID,  /**< Geometry shader only */
    SYSTEM_VALUE_MAX             /**< Number of values */
 } gl_system_value;
 




More information about the mesa-commit mailing list