Mesa (master): glsl/shader_enums: Add the other two compute builtins

Jason Ekstrand jekstrand at kemper.freedesktop.org
Mon Apr 11 20:56:46 UTC 2016


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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Mar 25 10:51:23 2016 -0700

glsl/shader_enums: Add the other two compute builtins

These weren't added before because they are actually calculated values that
are computed from other inputs.  However, in order to handle them in
nir_lower_system_values, it's nice for them to have a cannonical locaiton.

Reviewed-by: Rob Clark <robdclark at gmail.com>

---

 src/compiler/shader_enums.c | 2 ++
 src/compiler/shader_enums.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c
index 003ad3b..ff2f564 100644
--- a/src/compiler/shader_enums.c
+++ b/src/compiler/shader_enums.c
@@ -215,6 +215,8 @@ gl_system_value_name(gl_system_value sysval)
      ENUM(SYSTEM_VALUE_TESS_LEVEL_OUTER),
      ENUM(SYSTEM_VALUE_TESS_LEVEL_INNER),
      ENUM(SYSTEM_VALUE_LOCAL_INVOCATION_ID),
+     ENUM(SYSTEM_VALUE_LOCAL_INVOCATION_INDEX),
+     ENUM(SYSTEM_VALUE_GLOBAL_INVOCATION_ID),
      ENUM(SYSTEM_VALUE_WORK_GROUP_ID),
      ENUM(SYSTEM_VALUE_NUM_WORK_GROUPS),
      ENUM(SYSTEM_VALUE_VERTEX_CNT),
diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h
index 0c43d5a..0c27408 100644
--- a/src/compiler/shader_enums.h
+++ b/src/compiler/shader_enums.h
@@ -459,6 +459,8 @@ typedef enum
     */
    /*@{*/
    SYSTEM_VALUE_LOCAL_INVOCATION_ID,
+   SYSTEM_VALUE_LOCAL_INVOCATION_INDEX,
+   SYSTEM_VALUE_GLOBAL_INVOCATION_ID,
    SYSTEM_VALUE_WORK_GROUP_ID,
    SYSTEM_VALUE_NUM_WORK_GROUPS,
    /*@}*/




More information about the mesa-commit mailing list