Color filters were ignored by the program cache fast path.

Change-Id: I08f2f02d356234a674be778d088e0558fd49c849
2010-10-13 21:31:28 -07:00
parent 1b422d8cd8
commit 4afdf666fd
2 changed files with 2 additions and 2 deletions
--- 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;
--- 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())