summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-03-29 16:44:29 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-03-29 16:44:29 -0700
commit06e5308e29e42d22a72247abfdd260bc9ba145b8 (patch)
tree3a46851a46be96dd963fe3c138c2aa5be6f3ba05
parentbfb09c2a94414c1b40108c9c41eb0844d932e459 (diff)
Add parser support for texture rectangle types
-rw-r--r--ast.h2
-rw-r--r--ast_type.cpp2
-rw-r--r--glsl_parser.ypp2
3 files changed, 6 insertions, 0 deletions
diff --git a/ast.h b/ast.h
index 53b0e4a2b4..8e904bccc9 100644
--- 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 3bfbc647a1..cb0852bb77 100644
--- 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 7af93dd944..4a58666d76 100644
--- 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; }