commit b36749d066bcba848d08937090492c33a277851d
author Brian <brian.paul@tungstengraphics.com> Mon Jul 21 20:42:05 2008 -0600
committer Brian Paul <brian.paul@tungstengraphics.com> Tue Jul 29 17:19:40 2008 -0600
tree 3449b249d68a40732d9e7c3380e9131c69ddc4e3
parent b7eea9a1ce9f3a28b74d77db19dcd859b6638a41

mesa: fix glUniform error checking for samplers

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 25c0484..cbb90fa 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1209,6 +1209,27 @@
 }
 
 
+static GLboolean
+is_sampler_type(GLenum type)
+{
+   switch (type) {
+   case GL_SAMPLER_1D:
+   case GL_SAMPLER_2D:
+   case GL_SAMPLER_3D:
+   case GL_SAMPLER_CUBE:
+   case GL_SAMPLER_1D_SHADOW:
+   case GL_SAMPLER_2D_SHADOW:
+   case GL_SAMPLER_2D_RECT_ARB:
+   case GL_SAMPLER_2D_RECT_SHADOW_ARB:
+   case GL_SAMPLER_1D_ARRAY_EXT:
+   case GL_SAMPLER_2D_ARRAY_EXT:
+      return GL_TRUE;
+   default:
+      return GL_FALSE;
+   }
+}
+
+
 /**
  * Check if the type given by userType is allowed to set a uniform of the
  * target type.  Generally, equivalence is required, but setting Boolean
@@ -1235,6 +1256,9 @@
                                       userType == GL_INT_VEC4))
       return GL_TRUE;
 
+   if (is_sampler_type(targetType) && userType == GL_INT)
+      return GL_TRUE;
+
    return GL_FALSE;
 }