commit 707b2f78ccaa09965d7e030fda3a883ce9b75ea8
author Romain Guy <romainguy@google.com> Mon Oct 11 16:34:59 2010 -0700
committer Romain Guy <romainguy@google.com> Mon Oct 11 16:34:59 2010 -0700
tree 0503326cbed34fe219dc32508456b5ce9bd03340
parent 7537f856f9076a84db04d8de447f6527b67166fd

Optimize GLSL shaders.

Change-Id: I9a5e01bced63d8da0c61330a543a2b805388a59d

libs/hwui/OpenGLRenderer.cpp

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 5b226b4..4878063 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -985,6 +985,7 @@
      ProgramDescription description;
      description.hasTexture = true;
      description.hasAlpha8Texture = true;
+     const bool setColor = description.setAlpha8Color(r, g, b, a);
 
      if (applyFilters) {
          if (mShader) {
@@ -1021,7 +1022,9 @@
          mModelView.loadIdentity();
      }
      mCaches.currentProgram->set(mOrthoMatrix, mModelView, *mSnapshot->transform);
-     glUniform4f(mCaches.currentProgram->color, r, g, b, a);
+     if (setColor) {
+         mCaches.currentProgram->setColor(r, g, b, a);
+     }
 
      textureUnit++;
      if (applyFilters) {
@@ -1126,6 +1129,8 @@
 
     // Describe the required shaders
     ProgramDescription description;
+    const bool setColor = description.setColor(r, g, b, a);
+
     if (mShader) {
         mShader->describe(description, mExtensions);
     }
@@ -1152,7 +1157,7 @@
         mat4 identity;
         mCaches.currentProgram->set(mOrthoMatrix, mModelView, identity);
     }
-    glUniform4f(mCaches.currentProgram->color, r, g, b, a);
+    mCaches.currentProgram->setColor(r, g, b, a);
 
     // Setup attributes and uniforms required by the shaders
     if (mShader) {
@@ -1189,6 +1194,7 @@
 
     ProgramDescription description;
     description.hasTexture = true;
+    const bool setColor = description.setColor(alpha, alpha, alpha, alpha);
     if (mColorFilter) {
         mColorFilter->describe(description, mExtensions);
     }
@@ -1211,7 +1217,9 @@
     glUniform1i(mCaches.currentProgram->getUniform("sampler"), 0);
 
     // Always premultiplied
-    glUniform4f(mCaches.currentProgram->color, alpha, alpha, alpha, alpha);
+    if (setColor) {
+        mCaches.currentProgram->setColor(alpha, alpha, alpha, alpha);
+    }
 
     // Mesh
     int texCoordsSlot = mCaches.currentProgram->getAttrib("texCoords");