Don't bind data to missing uniforms

Romain Guy · Romain Guy · commit 55fd2c9b2e87 · 2012-03-09T17:37:29.000-08:00
Change-Id: Ib9d1f14eb0bef04e0910baa4eaf3e49cce81c0ce
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
@@ -1189,7 +1189,7 @@ void OpenGLRenderer::setupDrawPointUniforms() {
 }
 
 void OpenGLRenderer::setupDrawColorUniforms() {
-    if (mColorSet || (mShader && mSetShaderColor)) {
+    if ((mColorSet && !mShader) || (mShader && mSetShaderColor)) {
         mCaches.currentProgram->setColor(mColorR, mColorG, mColorB, mColorA);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1189,7 +1189,7 @@ void OpenGLRenderer::setupDrawPointUniforms() {`
`1189`	`1189`	`}`
`1190`	`1190`
`1191`	`1191`	`void OpenGLRenderer::setupDrawColorUniforms() {`
`1192`		`- if (mColorSet \|\| (mShader && mSetShaderColor)) {`
	`1192`	`+ if ((mColorSet && !mShader) \|\| (mShader && mSetShaderColor)) {`
`1193`	`1193`	`mCaches.currentProgram->setColor(mColorR, mColorG, mColorB, mColorA);`
`1194`	`1194`	`}`
`1195`	`1195`	`}`