glsl: Make a function to express a GLSL version ir human-readable form.

[mesa.git] / src / glsl / glsl_lexer.ll

diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index e444536f5a2af5659465e203bdf5d0bef5299c43..c538d7d8e309c23a0450fc7eaa41a9ab88950f7c 100644 (file)
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -93,7 +93,11 @@ literal_integer(char *text, int len, struct _mesa_glsl_parse_state *state,
    if (base == 16)
       digits += 2;
 
+#ifdef _MSC_VER
+   unsigned __int64 value = _strtoui64(digits, NULL, base);
+#else
    unsigned long long value = strtoull(digits, NULL, base);
+#endif
 
    lval->n = (int)value;
 
@@ -144,7 +148,7 @@ HASH                ^{SPC}#{SPC}
 
     /* Preprocessor tokens. */ 
 ^[ \t]*#[ \t]*$                        ;
-^[ \t]*#[ \t]*version          { BEGIN PP; return VERSION; }
+^[ \t]*#[ \t]*version          { BEGIN PP; return VERSION_TOK; }
 ^[ \t]*#[ \t]*extension                { BEGIN PP; return EXTENSION; }
 {HASH}line{SPCP}{INT}{SPCP}{INT}{SPC}$ {
                                   /* Eat characters until the first digit is
@@ -292,6 +296,38 @@ usamplerCube               KEYWORD(130, 130, USAMPLERCUBE);
 usampler1DArray                KEYWORD(130, 130, USAMPLER1DARRAY);
 usampler2DArray                KEYWORD(130, 130, USAMPLER2DARRAY);
 
+samplerCubeArray       {
+                         if (yyextra->ARB_texture_cube_map_array_enable)
+                            return SAMPLERCUBEARRAY;
+                         else
+                            return IDENTIFIER;
+               }
+isamplerCubeArray      {
+                         if (yyextra->ARB_texture_cube_map_array_enable)
+                            return ISAMPLERCUBEARRAY;
+                         else
+                            return IDENTIFIER;
+               }
+usamplerCubeArray      {
+                         if (yyextra->ARB_texture_cube_map_array_enable)
+                            return USAMPLERCUBEARRAY;
+                         else
+                            return IDENTIFIER;
+               }
+samplerCubeArrayShadow {
+                         if (yyextra->ARB_texture_cube_map_array_enable)
+                            return SAMPLERCUBEARRAYSHADOW;
+                         else
+                            return IDENTIFIER;
+               }
+
+samplerExternalOES             {
+                         if (yyextra->OES_EGL_image_external_enable)
+                            return SAMPLEREXTERNALOES;
+                         else
+                            return IDENTIFIER;
+               }
+
 
 struct         return STRUCT;
 void           return VOID_TOK;
@@ -299,7 +335,9 @@ void                return VOID_TOK;
 layout         {
                  if ((yyextra->language_version >= 140)
                      || yyextra->AMD_conservative_depth_enable
+                     || yyextra->ARB_conservative_depth_enable
                      || yyextra->ARB_explicit_attrib_location_enable
+                     || yyextra->ARB_uniform_buffer_object_enable
                      || yyextra->ARB_fragment_coord_conventions_enable) {
                      return LAYOUT_TOK;
                   } else {
@@ -380,7 +418,7 @@ enum                KEYWORD(110 || ES, 999, ENUM);
 typedef                KEYWORD(110 || ES, 999, TYPEDEF);
 template       KEYWORD(110 || ES, 999, TEMPLATE);
 this           KEYWORD(110 || ES, 999, THIS);
-packed         KEYWORD(110 || ES, 999, PACKED_TOK);
+packed         KEYWORD(110 || ES, 140 || yyextra->ARB_uniform_buffer_object_enable, PACKED_TOK);
 goto           KEYWORD(110 || ES, 999, GOTO);
 switch         KEYWORD(110 || ES, 130, SWITCH);
 default                KEYWORD(110 || ES, 130, DEFAULT);
@@ -456,7 +494,13 @@ image2DArrayShadow KEYWORD(130, 999, IMAGE2DARRAYSHADOW);
 imageBuffer    KEYWORD(130, 999, IMAGEBUFFER);
 iimageBuffer   KEYWORD(130, 999, IIMAGEBUFFER);
 uimageBuffer   KEYWORD(130, 999, UIMAGEBUFFER);
-row_major      KEYWORD(130, 999, ROW_MAJOR);
+row_major      KEYWORD(130, 140 || yyextra->ARB_uniform_buffer_object_enable, ROW_MAJOR);
+
+    /* Additional reserved words in GLSL 1.40 */
+isampler2DRect KEYWORD(140, 140, ISAMPLER2DRECT);
+usampler2DRect KEYWORD(140, 140, USAMPLER2DRECT);
+isamplerBuffer KEYWORD(140, 140, ISAMPLERBUFFER);
+usamplerBuffer KEYWORD(140, 140, USAMPLERBUFFER);
 
 [_a-zA-Z][_a-zA-Z0-9]* {
                            struct _mesa_glsl_parse_state *state = yyextra;