summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2010-11-11 12:18:03 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-11-11 12:18:03 -0800
commit50c5e4c36e494d092576d42cf2b406abab20510a (patch)
tree4866c5515acbec3e6cb97a633718e5907e4fe9f9 /libs/hwui/OpenGLRenderer.cpp
parent8b83d25222a59a958b702cac03292332befeef50 (diff)
parent01d065795794fa56be660d6346e4830eb7e90a41 (diff)
Merge "Reduce number of GL calls when drawing with shaders."
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 540f11580900..acce1a2155fe 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1463,7 +1463,9 @@ void OpenGLRenderer::setupColorRect(float left, float top, float right, float bo
dirtyLayer(left, top, right, bottom);
}
}
- mCaches.currentProgram->setColor(r, g, b, a);
+ if (!mShader || (mShader && setColor)) {
+ mCaches.currentProgram->setColor(r, g, b, a);
+ }
// Setup attributes and uniforms required by the shaders
if (mShader) {