diff options
| author | Romain Guy <romainguy@google.com> | 2012-03-09 17:36:01 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2012-03-09 17:37:29 -0800 |
| commit | 55fd2c9b2e87986b03cb58676bdf46bc6d5f1c36 (patch) | |
| tree | d992f9e11ac37f021fba69d0de76575864e4902d /libs/hwui | |
| parent | 887c2eea31a9ef2bc27186773e173e083eee7314 (diff) | |
| download | frameworks_base-55fd2c9b2e87986b03cb58676bdf46bc6d5f1c36.zip frameworks_base-55fd2c9b2e87986b03cb58676bdf46bc6d5f1c36.tar.gz frameworks_base-55fd2c9b2e87986b03cb58676bdf46bc6d5f1c36.tar.bz2 | |
Don't bind data to missing uniforms
Change-Id: Ib9d1f14eb0bef04e0910baa4eaf3e49cce81c0ce
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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::setupDrawPointUniforms() { } void OpenGLRenderer::setupDrawColorUniforms() { - if (mColorSet || (mShader && mSetShaderColor)) { + if ((mColorSet && !mShader) || (mShader && mSetShaderColor)) { mCaches.currentProgram->setColor(mColorR, mColorG, mColorB, mColorA); } } |