commit 55fd2c9b2e87986b03cb58676bdf46bc6d5f1c36
author Romain Guy <romainguy@google.com> Fri Mar 09 17:36:01 2012 -0800
committer Romain Guy <romainguy@google.com> Fri Mar 09 17:37:29 2012 -0800
tree d992f9e11ac37f021fba69d0de76575864e4902d
parent 887c2eea31a9ef2bc27186773e173e083eee7314

Don't bind data to missing uniforms

Change-Id: Ib9d1f14eb0bef04e0910baa4eaf3e49cce81c0ce

libs/hwui/OpenGLRenderer.cpp

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 339ae0a..b4310ea 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1189,7 +1189,7 @@
 }
 
 void OpenGLRenderer::setupDrawColorUniforms() {
-    if (mColorSet || (mShader && mSetShaderColor)) {
+    if ((mColorSet && !mShader) || (mShader && mSetShaderColor)) {
         mCaches.currentProgram->setColor(mColorR, mColorG, mColorB, mColorA);
     }
 }