Mesa (master): glcpp: Automatically #define GL_core_profile 1 on GLSL 1.50+ .

Kenneth Graunke kwg at kemper.freedesktop.org
Mon Jun 10 17:55:44 UTC 2013


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun  7 22:04:23 2013 -0700

glcpp: Automatically #define GL_core_profile 1 on GLSL 1.50+.

Page 17 of the GLSL 1.50.11 specification states:
"There is a built-in macro definition for each profile the
 implementation supports.  All implementations provide the following
 macro:

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/glcpp/glcpp-parse.y |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 81ba04b..fe36c12 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -2064,6 +2064,9 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
 		add_builtin_define (parser, "GL_ES", 1);
 	}
 
+	if (version >= 150)
+		add_builtin_define(parser, "GL_core_profile", 1);
+
 	/* Currently, all ES2/ES3 implementations support highp in the
 	 * fragment shader, so we always define this macro in ES2/ES3.
 	 * If we ever get a driver that doesn't support highp, we'll




More information about the mesa-commit mailing list