diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-11-09 12:48:34 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-11-09 13:05:07 -0800 |
| commit | 956ae44dcf63671bb5707c369d3ff2bee3476cd9 (patch) | |
| tree | 22254d62d41cd3c6abf39a20eab75ac92c3cd2ea /src/glsl/builtin_types.h | |
| parent | 10740acf46e08960dde790005d65a98440f313bc (diff) | |
glsl: Fix incorrect gl_type of sampler2DArray and sampler1DArrayShadow
NOTE: this is a candidate for the 7.9 branch.
Diffstat (limited to 'src/glsl/builtin_types.h')
| -rw-r--r-- | src/glsl/builtin_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/builtin_types.h b/src/glsl/builtin_types.h index 7175e08afb..443ae1606e 100644 --- a/src/glsl/builtin_types.h +++ b/src/glsl/builtin_types.h @@ -275,9 +275,9 @@ const glsl_type glsl_type::builtin_ARB_texture_rectangle_types[] = { const glsl_type glsl_type::builtin_EXT_texture_array_types[] = { glsl_type(GL_SAMPLER_1D_ARRAY, GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_FLOAT, "sampler1DArray"), - glsl_type(GL_SAMPLER_1D_ARRAY_SHADOW, - GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_FLOAT, "sampler2DArray"), glsl_type(GL_SAMPLER_2D_ARRAY, + GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_FLOAT, "sampler2DArray"), + glsl_type(GL_SAMPLER_1D_ARRAY_SHADOW, GLSL_SAMPLER_DIM_1D, 1, 1, GLSL_TYPE_FLOAT, "sampler1DArrayShadow"), glsl_type(GL_SAMPLER_2D_ARRAY_SHADOW, GLSL_SAMPLER_DIM_2D, 1, 1, GLSL_TYPE_FLOAT, "sampler2DArrayShadow"), |