Mesa (glsl2): glsl2: Add the define for ARB_fragment_coord_conventions when present.

Eric Anholt anholt at kemper.freedesktop.org
Wed Jul 28 22:01:09 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jul 28 14:58:31 2010 -0700

glsl2: Add the define for ARB_fragment_coord_conventions when present.

Fixes:
glsl-arb-fragment-coord-conventions-define

---

 src/glsl/glcpp/glcpp-parse.c |    8 ++++++++
 src/glsl/glcpp/glcpp-parse.y |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index 2f08ff8..8fbbdab 100644
--- a/src/glsl/glcpp/glcpp-parse.c
+++ b/src/glsl/glcpp/glcpp-parse.c
@@ -3242,6 +3242,14 @@ glcpp_parser_create (const struct gl_extensions *extensions)
 				     "GL_EXT_texture_array", list);
 	}
 
+	if ((extensions != NULL) &&
+	    extensions->ARB_fragment_coord_conventions) {
+		list = _token_list_create(parser);
+		_token_list_append(list, tok);
+		_define_object_macro(parser, NULL,
+				     "GL_ARB_fragment_coord_conventions", list);
+	}
+
 	talloc_unlink(parser, tok);
 
 	return parser;
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 41cfff5..c6ff32e 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -937,6 +937,14 @@ glcpp_parser_create (const struct gl_extensions *extensions)
 				     "GL_EXT_texture_array", list);
 	}
 
+	if ((extensions != NULL) &&
+	    extensions->ARB_fragment_coord_conventions) {
+		list = _token_list_create(parser);
+		_token_list_append(list, tok);
+		_define_object_macro(parser, NULL,
+				     "GL_ARB_fragment_coord_conventions", list);
+	}
+
 	talloc_unlink(parser, tok);
 
 	return parser;




More information about the mesa-commit mailing list