Mesa (7.9): glsl: Fix incorrect gl_type of sampler2DArray and sampler1DArrayShadow
Ian Romanick
idr at kemper.freedesktop.org
Wed Dec 15 22:06:30 UTC 2010
Module: Mesa
Branch: 7.9
Commit: 8454f931d64902822c8009bdf1f17aea0739add1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8454f931d64902822c8009bdf1f17aea0739add1
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Nov 9 12:48:34 2010 -0800
glsl: Fix incorrect gl_type of sampler2DArray and sampler1DArrayShadow
NOTE: this is a candidate for the 7.9 branch.
(cherry picked from commit 956ae44dcf63671bb5707c369d3ff2bee3476cd9)
---
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 6dabbf0..e1bf9db 100644
--- a/src/glsl/builtin_types.h
+++ b/src/glsl/builtin_types.h
@@ -273,9 +273,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"),
More information about the mesa-commit
mailing list