Add parser support for texture rectangle types

diff --git a/ast.h b/ast.h
index 53b0e4a2b410d80151bb809f15edf754736f990a..8e904bccc97aeaccf606ab488c90375b3e1e2cdf 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -326,10 +326,12 @@ enum ast_types {
    ast_mat4,
    ast_sampler1d,
    ast_sampler2d,
+   ast_sampler2drect,
    ast_sampler3d,
    ast_samplercube,
    ast_sampler1dshadow,
    ast_sampler2dshadow,
+   ast_sampler2drectshadow,
    ast_samplercubeshadow,
    ast_sampler1darray,
    ast_sampler2darray,

diff --git a/ast_type.cpp b/ast_type.cpp
index 3bfbc647a1efdc2ffbdc1d4532a3b7352456d918..cb0852bb77331484e97b1ee52ef996d91d54c97d 100644 (file)
--- a/ast_type.cpp
+++ b/ast_type.cpp
@@ -78,10 +78,12 @@ ast_type_specifier::ast_type_specifier(int specifier)
       "mat4",
       "sampler1D",
       "sampler2D",
+      "sampler2DRect",
       "sampler3D",
       "samplerCube",
       "sampler1DShadow",
       "sampler2DShadow",
+      "sampler2DRectShadow",
       "samplerCubeShadow",
       "sampler1DArray",
       "sampler2DArray",

diff --git a/glsl_parser.ypp b/glsl_parser.ypp
index 7af93dd9447cb771c625b1d8322b2599b5c18113..4a58666d763ac1cc49d26b788b665036df1a79f1 100644 (file)
--- a/glsl_parser.ypp
+++ b/glsl_parser.ypp
@@ -900,10 +900,12 @@ basic_type_specifier_nonarray:
        | MAT4X4                { $$ = ast_mat4; }
        | SAMPLER1D             { $$ = ast_sampler1d; }
        | SAMPLER2D             { $$ = ast_sampler2d; }
+       | SAMPLER2DRECT         { $$ = ast_sampler2drect; }
        | SAMPLER3D             { $$ = ast_sampler3d; }
        | SAMPLERCUBE           { $$ = ast_samplercube; }
        | SAMPLER1DSHADOW       { $$ = ast_sampler1dshadow; }
        | SAMPLER2DSHADOW       { $$ = ast_sampler2dshadow; }
+       | SAMPLER2DRECTSHADOW   { $$ = ast_sampler2drectshadow; }
        | SAMPLERCUBESHADOW     { $$ = ast_samplercubeshadow; }
        | SAMPLER1DARRAY        { $$ = ast_sampler1darray; }
        | SAMPLER2DARRAY        { $$ = ast_sampler2darray; }