On 12/16/2013 03:18 PM, Paul Berry wrote: > I'm not aware of any piglit tests that this fixes, but the old code > was obviously wrong. > --- > src/glsl/builtin_type_macros.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/glsl/builtin_type_macros.h b/src/glsl/builtin_type_macros.h > index 263fd83..06b4dbd 100644 > --- a/src/glsl/builtin_type_macros.h > +++ b/src/glsl/builtin_type_macros.h > @@ -91,7 +91,7 @@ DECL_TYPE(isampler2DMSArray, > GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY, GLSL_SAMPLER_D > DECL_TYPE(usampler1D, GL_UNSIGNED_INT_SAMPLER_1D, > GLSL_SAMPLER_DIM_1D, 0, 0, GLSL_TYPE_UINT) > DECL_TYPE(usampler2D, GL_UNSIGNED_INT_SAMPLER_2D, > GLSL_SAMPLER_DIM_2D, 0, 0, GLSL_TYPE_UINT) > DECL_TYPE(usampler3D, GL_UNSIGNED_INT_SAMPLER_3D, > GLSL_SAMPLER_DIM_3D, 0, 0, GLSL_TYPE_UINT) > -DECL_TYPE(usamplerCube, GL_INT_SAMPLER_CUBE, > GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_UINT) > +DECL_TYPE(usamplerCube, GL_UNSIGNED_INT_SAMPLER_CUBE, > GLSL_SAMPLER_DIM_CUBE, 0, 0, GLSL_TYPE_UINT) > DECL_TYPE(usampler1DArray, GL_UNSIGNED_INT_SAMPLER_1D_ARRAY, > GLSL_SAMPLER_DIM_1D, 0, 1, GLSL_TYPE_UINT) > DECL_TYPE(usampler2DArray, GL_UNSIGNED_INT_SAMPLER_2D_ARRAY, > GLSL_SAMPLER_DIM_2D, 0, 1, GLSL_TYPE_UINT) > DECL_TYPE(usamplerCubeArray, GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY, > GLSL_SAMPLER_DIM_CUBE, 0, 1, GLSL_TYPE_UINT) >
Reviewed-by: Kenneth Graunke <[email protected]> _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
