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/renderer/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 9640c0a..c9eb918 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -1636,17 +1636,16 @@
             int count = targetUniform->elementCount();
             GLfloat *f = (GLfloat*)targetUniform->data;
             GLint *i = (GLint*)targetUniform->data;
-            GLboolean *b = (GLboolean*)targetUniform->data;
 
             switch (targetUniform->type)
             {
               case GL_SAMPLER_2D:
               case GL_SAMPLER_CUBE:
                   break;
-              case GL_BOOL:       applyUniformnbv(targetUniform, count, 1, b);    break;
-              case GL_BOOL_VEC2:  applyUniformnbv(targetUniform, count, 2, b);    break;
-              case GL_BOOL_VEC3:  applyUniformnbv(targetUniform, count, 3, b);    break;
-              case GL_BOOL_VEC4:  applyUniformnbv(targetUniform, count, 4, b);    break;
+              case GL_BOOL:       applyUniformnbv(targetUniform, count, 1, i);    break;
+              case GL_BOOL_VEC2:  applyUniformnbv(targetUniform, count, 2, i);    break;
+              case GL_BOOL_VEC3:  applyUniformnbv(targetUniform, count, 3, i);    break;
+              case GL_BOOL_VEC4:  applyUniformnbv(targetUniform, count, 4, i);    break;
               case GL_FLOAT:
               case GL_FLOAT_VEC2:
               case GL_FLOAT_VEC3:
@@ -1675,7 +1674,7 @@
     }
 }
 
-void Renderer9::applyUniformnbv(gl::Uniform *targetUniform, GLsizei count, int width, const GLboolean *v)
+void Renderer9::applyUniformnbv(gl::Uniform *targetUniform, GLsizei count, int width, const GLint *v)
 {
     float vector[D3D9_MAX_FLOAT_CONSTANTS * 4];