uniforms: accept all int/unsigned int sampler types in uniform checks.

I'm not 100% sure about this, it may need a version check or it might
be completely wrong.

added multisample ones as well.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index b0f9c33b8d343add204803e1c3a138fe418f1690..2323819aa43373c2bc70ee9cc91ae68ae227c2e8 100644 (file)
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -111,21 +111,43 @@ is_sampler_type(GLenum type)
 {
    switch (type) {
    case GL_SAMPLER_1D:
+   case GL_INT_SAMPLER_1D:
+   case GL_UNSIGNED_INT_SAMPLER_1D:
    case GL_SAMPLER_2D:
+   case GL_INT_SAMPLER_2D:
+   case GL_UNSIGNED_INT_SAMPLER_2D:
    case GL_SAMPLER_3D:
+   case GL_INT_SAMPLER_3D:
+   case GL_UNSIGNED_INT_SAMPLER_3D:
    case GL_SAMPLER_CUBE:
+   case GL_INT_SAMPLER_CUBE:
+   case GL_UNSIGNED_INT_SAMPLER_CUBE:
    case GL_SAMPLER_1D_SHADOW:
    case GL_SAMPLER_2D_SHADOW:
    case GL_SAMPLER_CUBE_SHADOW:
    case GL_SAMPLER_2D_RECT_ARB:
+   case GL_INT_SAMPLER_2D_RECT:
+   case GL_UNSIGNED_INT_SAMPLER_2D_RECT:
    case GL_SAMPLER_2D_RECT_SHADOW_ARB:
    case GL_SAMPLER_1D_ARRAY_EXT:
+   case GL_INT_SAMPLER_1D_ARRAY:
+   case GL_UNSIGNED_INT_SAMPLER_1D_ARRAY:
    case GL_SAMPLER_2D_ARRAY_EXT:
+   case GL_INT_SAMPLER_2D_ARRAY:
+   case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
    case GL_SAMPLER_1D_ARRAY_SHADOW_EXT:
    case GL_SAMPLER_2D_ARRAY_SHADOW_EXT:
    case GL_SAMPLER_CUBE_MAP_ARRAY:
    case GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW:
    case GL_SAMPLER_BUFFER:
+   case GL_INT_SAMPLER_BUFFER:
+   case GL_UNSIGNED_INT_SAMPLER_BUFFER:
+   case GL_SAMPLER_2D_MULTISAMPLE:
+   case GL_INT_SAMPLER_2D_MULTISAMPLE:
+   case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE:
+   case GL_SAMPLER_2D_MULTISAMPLE_ARRAY:
+   case GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
+   case GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY:
       return GL_TRUE;
    default:
       return GL_FALSE;