Mesa (master): mesa: Make gl_VertexID be a system value like gl_InstanceID.

Eric Anholt anholt at kemper.freedesktop.org
Fri Nov 11 16:41:15 UTC 2011


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov  8 14:49:07 2011 -0800

mesa: Make gl_VertexID be a system value like gl_InstanceID.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

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

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 0d804c2..ed6b922 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -98,7 +98,7 @@ static const builtin_variable builtin_120_fs_variables[] = {
 };
 
 static const builtin_variable builtin_130_vs_variables[] = {
-   { ir_var_in,  -1,                 "int",   "gl_VertexID" },
+   { ir_var_system_value,  SYSTEM_VALUE_VERTEX_ID, "int",   "gl_VertexID" },
 };
 
 static const builtin_variable builtin_110_deprecated_uniforms[] = {
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index adcbaeb..deab97d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1798,6 +1798,7 @@ typedef enum
 typedef enum
 {
    SYSTEM_VALUE_FRONT_FACE,  /**< Fragment shader only (not done yet) */
+   SYSTEM_VALUE_VERTEX_ID,   /**< Vertex shader only */
    SYSTEM_VALUE_INSTANCE_ID, /**< Vertex shader only */
    SYSTEM_VALUE_MAX          /**< Number of values */
 } gl_system_value;




More information about the mesa-commit mailing list