Mesa (glsl2): glsl2: Add support for gl_PointCoord in 1.20.

Eric Anholt anholt at kemper.freedesktop.org
Thu Jul 8 04:38:20 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 152b55e74da7bf548d8846538b85960f703d6059
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=152b55e74da7bf548d8846538b85960f703d6059

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jul  7 19:45:22 2010 -0700

glsl2: Add support for gl_PointCoord in 1.20.

Fixes glsl-fs-pointcoord on swrast (remains broken on 965, like master)

---

 src/glsl/builtin_variables.h |    4 ++++
 src/glsl/ir_variable.cpp     |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/glsl/builtin_variables.h b/src/glsl/builtin_variables.h
index 77f2fe5..9551e1a 100644
--- a/src/glsl/builtin_variables.h
+++ b/src/glsl/builtin_variables.h
@@ -70,6 +70,10 @@ static const builtin_variable builtin_110_deprecated_vs_variables[] = {
    { ir_var_out, VERT_RESULT_FOGC,   "float", "gl_FogFragCoord" },
 };
 
+static const builtin_variable builtin_120_fs_variables[] = {
+   { ir_var_in,  FRAG_ATTRIB_PNTC,   "vec2",   "gl_PointCoord" },
+};
+
 static const builtin_variable builtin_130_vs_variables[] = {
    { ir_var_in,  -1,                 "int",   "gl_VertexID" },
 };
diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp
index 9daad80..a0b66b7 100644
--- a/src/glsl/ir_variable.cpp
+++ b/src/glsl/ir_variable.cpp
@@ -311,6 +311,13 @@ generate_120_fs_variables(exec_list *instructions,
 			  struct _mesa_glsl_parse_state *state)
 {
    generate_110_fs_variables(instructions, state);
+
+   for (unsigned i = 0
+	   ; i < Elements(builtin_120_fs_variables)
+	   ; i++) {
+      add_builtin_variable(& builtin_120_fs_variables[i],
+			   instructions, state->symbols);
+   }
 }
 
 static void




More information about the mesa-commit mailing list