diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-08-07 02:03:00 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-09-07 17:30:37 -0700 |
| commit | 76deef138ee25ab57b4716aef41ce0c94081f20a (patch) | |
| tree | 5335cb9adf19d835376d9f618448127d02f240d6 /src/glsl/builtin_types.h | |
| parent | c5e74871d9e4b555f3927fd11944c769d466bd12 (diff) | |
glsl: Split out types that are in 1.10 but not GLSL ES 1.00.
Diffstat (limited to 'src/glsl/builtin_types.h')
| -rw-r--r-- | src/glsl/builtin_types.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/glsl/builtin_types.h b/src/glsl/builtin_types.h index 7b94aac666..6dabbf0d32 100644 --- a/src/glsl/builtin_types.h +++ b/src/glsl/builtin_types.h @@ -51,16 +51,8 @@ const glsl_type glsl_type::builtin_core_types[] = { glsl_type(GL_FLOAT_MAT2, GLSL_TYPE_FLOAT, 2, 2, "mat2"), glsl_type(GL_FLOAT_MAT3, GLSL_TYPE_FLOAT, 3, 3, "mat3"), glsl_type(GL_FLOAT_MAT4, GLSL_TYPE_FLOAT, 4, 4, "mat4"), - glsl_type(GL_SAMPLER_1D, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_FLOAT, - "sampler1D"), - glsl_type(GL_SAMPLER_1D_SHADOW, GLSL_SAMPLER_DIM_1D, 1, 0, GLSL_TYPE_FLOAT, - "sampler1DShadow"), glsl_type(GL_SAMPLER_2D, GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_FLOAT, "sampler2D"), - glsl_type(GL_SAMPLER_2D_SHADOW, GLSL_SAMPLER_DIM_2D, 1, 0, GLSL_TYPE_FLOAT, - "sampler2DShadow"), - glsl_type(GL_SAMPLER_3D, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_FLOAT, - "sampler3D"), glsl_type(GL_SAMPLER_CUBE, GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_FLOAT, "samplerCube"), }; @@ -178,6 +170,21 @@ const glsl_type glsl_type::builtin_110_deprecated_structure_types[] = { }; /*@}*/ +/** \name Types in GLSL 1.10 (but not GLSL ES 1.00) + */ +/*@{*/ +const glsl_type glsl_type::builtin_110_types[] = { + glsl_type(GL_SAMPLER_1D, GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_FLOAT, + "sampler1D"), + glsl_type(GL_SAMPLER_1D_SHADOW, GLSL_SAMPLER_DIM_1D, 1, 0, GLSL_TYPE_FLOAT, + "sampler1DShadow"), + glsl_type(GL_SAMPLER_2D_SHADOW, GLSL_SAMPLER_DIM_2D, 1, 0, GLSL_TYPE_FLOAT, + "sampler2DShadow"), + glsl_type(GL_SAMPLER_3D, GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_FLOAT, + "sampler3D"), +}; +/*@}*/ + /** \name Types added in GLSL 1.20 */ /*@{*/ |