commit cd714ef2873a8f9efafa24d9479001024d113df3
author shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:09:50 2013 +0000
committer shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:09:50 2013 +0000
tree ca6a374dfa6ed87db6ed9a8152b6be7d825df8bd
parent a14ecf36b52fb0399deee3fab6f0c8d8c0abba5e

Store boolean uniforms as 32-bit integers.

TRAC #22428
Signed-off-by: Geoff Lang
Signed-off-by: Jamie Madill
Author: Nicolas Capens

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

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index d5038de..7a069ab 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -281,7 +281,7 @@
             return false; // attempting to write an array to a non-array uniform is an INVALID_OPERATION
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element;
 
         for (int i = 0; i < count; ++i)
         {
@@ -343,7 +343,7 @@
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
 
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element * 2;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * 2;
 
         for (int i = 0; i < count * 2; ++i)
         {
@@ -404,7 +404,7 @@
             return false; // attempting to write an array to a non-array uniform is an INVALID_OPERATION
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element * 3;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * 3;
 
         for (int i = 0; i < count * 3; ++i)
         {
@@ -456,7 +456,7 @@
             return false; // attempting to write an array to a non-array uniform is an INVALID_OPERATION
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element * 4;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * 4;
 
         for (int i = 0; i < count * 4; ++i)
         {
@@ -641,7 +641,7 @@
             return false; // attempting to write an array to a non-array uniform is an INVALID_OPERATION
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element;
 
         for (int i = 0; i < count; ++i)
         {
@@ -693,7 +693,7 @@
             return false; // attempting to write an array to a non-array uniform is an INVALID_OPERATION
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element * 2;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * 2;
 
         for (int i = 0; i < count * 2; ++i)
         {
@@ -745,7 +745,7 @@
             return false; // attempting to write an array to a non-array uniform is an INVALID_OPERATION
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element * 3;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * 3;
 
         for (int i = 0; i < count * 3; ++i)
         {
@@ -797,7 +797,7 @@
             return false; // attempting to write an array to a non-array uniform is an INVALID_OPERATION
 
         count = std::min(elementCount - (int)mUniformIndex[location].element, count);
-        GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element * 4;
+        GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * 4;
 
         for (int i = 0; i < count * 4; ++i)
         {
@@ -858,7 +858,7 @@
             {
               case GL_BOOL:
                 {
-                    GLboolean *boolParams = (GLboolean*)targetUniform->data + mUniformIndex[location].element * internalCount;
+                    GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * internalCount;
 
                     for (unsigned int i = 0; i < count; ++i)
                     {
@@ -933,11 +933,11 @@
             {
               case GL_BOOL:
                 {
-                    GLboolean *boolParams = targetUniform->data + mUniformIndex[location].element * internalCount;
+                    GLint *boolParams = (GLint*)targetUniform->data + mUniformIndex[location].element * internalCount;
 
                     for (unsigned int i = 0; i < count; ++i)
                     {
-                        params[i] = (GLint)boolParams[i];
+                        params[i] = boolParams[i];
                     }
                 }
                 break;