From 4afdf666fdb034834c48445570ed9d6f4133fc71 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Wed, 13 Oct 2010 21:31:28 -0700
Subject: [PATCH] Color filters were ignored by the program cache fast path.

Change-Id: I08f2f02d356234a674be778d088e0558fd49c849
---
 libs/hwui/ProgramCache.cpp | 2 +-
 libs/hwui/ProgramCache.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index 1eac2393422e9..3cd85c8d3b5f9 100644
--- a/libs/hwui/ProgramCache.cpp
+++ b/libs/hwui/ProgramCache.cpp
@@ -417,7 +417,7 @@ String8 ProgramCache::generateFragmentShader(const ProgramDescription& descripti
     }
 
     // Optimization for common cases
-    if (!blendFramebuffer) {
+    if (!blendFramebuffer && description.colorOp == ProgramDescription::kColorNone) {
         bool fast = false;
 
         const bool noShader = !description.hasGradient && !description.hasBitmap;
diff --git a/libs/hwui/ProgramCache.h b/libs/hwui/ProgramCache.h
index ec9851e8ea56b..9cb13b391f63d 100644
--- a/libs/hwui/ProgramCache.h
+++ b/libs/hwui/ProgramCache.h
@@ -135,7 +135,7 @@ struct ProgramDescription {
     GLenum bitmapWrapT;
 
     // Color operations
-    int colorOp;
+    ColorModifier colorOp;
     SkXfermode::Mode colorMode;
 
     // Framebuffer blending (requires Extensions.hasFramebufferFetch())