commit 76039476564cce21b5f31088ce21dac2e1ca74e4
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Apr 15 20:45:18 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Apr 15 20:45:18 2010 +0000
tree 84fee5108c20a846725404dddc51e6a9311c5144
parent 5af6427dc3c1842611a81455ad520cf95ab8d3dd

Fixed the GLSL ES version
TRAC #11867
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch

Author:    Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@154 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/preprocessor/cpp.c

diff --git a/src/compiler/preprocessor/cpp.c b/src/compiler/preprocessor/cpp.c
index d852fd4..08e9eab 100644
--- a/src/compiler/preprocessor/cpp.c
+++ b/src/compiler/preprocessor/cpp.c
@@ -630,7 +630,8 @@
 	return token;    
 } // CPPpragma
 
-#define GL2_VERSION_NUMBER 110
+#define ESSL_VERSION_NUMBER 100
+#define ESSL_VERSION_STRING "100"
 
 static int CPPversion(yystypepp * yylvalpp)
 {
@@ -652,8 +653,8 @@
     yylvalpp->sc_int=atoi(yylvalpp->symbol_name);
 	//SetVersionNumber(yylvalpp->sc_int);
     
-    if (yylvalpp->sc_int != GL2_VERSION_NUMBER)
-        CPPShInfoLogMsg("Version number not supported by GL2");
+    if (yylvalpp->sc_int != ESSL_VERSION_NUMBER)
+        CPPShInfoLogMsg("Version number not supported by ESSL");
 
     token = cpp->currentInput->scan(cpp->currentInput, yylvalpp);
     
@@ -896,7 +897,7 @@
         return 1;
     }
 	if (atom == __VERSION__Atom) {
-        strcpy(yylvalpp->symbol_name,"100");
+        strcpy(yylvalpp->symbol_name,ESSL_VERSION_STRING);
         yylvalpp->sc_int = atoi(yylvalpp->symbol_name);
         UngetToken(CPP_INTCONSTANT, yylvalpp);
         return 1;