commit 44ce5b11b8cf4ee5f03c2ead116a27369fe99e0e
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:40:30 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:40:30 2013 +0000
tree fd476a4400531b65ff500d975caf144f816aeddb
parent 8a19eed917b5f0354937567ca15fa755e0116ffa

Add handling of unsigned int uniform cases to utility functions.

TRAC #22845

Signed-off-by: Geoff Lang
Signed-off-by: Shanon Woods
Author: Jamie Madill

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2142 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/utilities.cpp

diff --git a/src/libGLESv2/utilities.cpp b/src/libGLESv2/utilities.cpp
index 75d8c25..62f5303 100644
--- a/src/libGLESv2/utilities.cpp
+++ b/src/libGLESv2/utilities.cpp
@@ -22,18 +22,22 @@
       case GL_INT:
       case GL_SAMPLER_2D:
       case GL_SAMPLER_CUBE:
+      case GL_UNSIGNED_INT:
           return 1;
       case GL_BOOL_VEC2:
       case GL_FLOAT_VEC2:
       case GL_INT_VEC2:
+      case GL_UNSIGNED_INT_VEC2:
           return 2;
       case GL_INT_VEC3:
       case GL_FLOAT_VEC3:
       case GL_BOOL_VEC3:
+      case GL_UNSIGNED_INT_VEC3:
           return 3;
       case GL_BOOL_VEC4:
       case GL_FLOAT_VEC4:
       case GL_INT_VEC4:
+      case GL_UNSIGNED_INT_VEC4:
       case GL_FLOAT_MAT2:
           return 4;
       case GL_FLOAT_MAT3:
@@ -71,6 +75,11 @@
       case GL_INT_VEC3:
       case GL_INT_VEC4:
           return GL_INT;
+      case GL_UNSIGNED_INT:
+      case GL_UNSIGNED_INT_VEC2:
+      case GL_UNSIGNED_INT_VEC3:
+      case GL_UNSIGNED_INT_VEC4:
+          return GL_UNSIGNED_INT;
       default:
           UNREACHABLE();
     }
@@ -82,9 +91,10 @@
 {
     switch(type)
     {
-      case GL_BOOL:  return sizeof(GLint);
-      case GL_FLOAT: return sizeof(GLfloat);
-      case GL_INT:   return sizeof(GLint);
+      case GL_BOOL:         return sizeof(GLint);
+      case GL_FLOAT:        return sizeof(GLfloat);
+      case GL_INT:          return sizeof(GLint);
+      case GL_UNSIGNED_INT: return sizeof(GLuint);
       default:       UNREACHABLE();
     }
 
@@ -108,15 +118,19 @@
     {
       case GL_FLOAT:
       case GL_INT:
+      case GL_UNSIGNED_INT:
         return GL_BOOL;
       case GL_FLOAT_VEC2:
       case GL_INT_VEC2:
+      case GL_UNSIGNED_INT_VEC2:
         return GL_BOOL_VEC2;
       case GL_FLOAT_VEC3:
       case GL_INT_VEC3:
+      case GL_UNSIGNED_INT_VEC3:
         return GL_BOOL_VEC3;
       case GL_FLOAT_VEC4:
       case GL_INT_VEC4:
+      case GL_UNSIGNED_INT_VEC4:
         return GL_BOOL_VEC4;
 
       default: