diff options
author | Romain Guy <romainguy@google.com> | 2012-09-26 11:23:17 -0700 |
---|---|---|
committer | Romain Guy <romainguy@google.com> | 2012-09-26 11:23:17 -0700 |
commit | e529ece37f664f8947a1d4a1e27d679f6f286388 (patch) | |
tree | e085f6513391293f8d0b1c08d9241adc3e48c1e0 | |
parent | 72a374705d32cf715443aa203f75c159e1bc9bd5 (diff) | |
download | frameworks_base-e529ece37f664f8947a1d4a1e27d679f6f286388.zip frameworks_base-e529ece37f664f8947a1d4a1e27d679f6f286388.tar.gz frameworks_base-e529ece37f664f8947a1d4a1e27d679f6f286388.tar.bz2 |
Applies a layer's color filter even when the layer is a quad
Bug #7238059
Change-Id: Ib4736a419bc1a9a67a01d090516ed049fe3aebca
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index d0d1d93..87c3a47 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2729,13 +2729,13 @@ status_t OpenGLRenderer::drawLayer(Layer* layer, float x, float y, SkPaint* pain mCaches.activeTexture(0); if (CC_LIKELY(!layer->region.isEmpty())) { + SkiaColorFilter* oldFilter = mColorFilter; + mColorFilter = layer->getColorFilter(); + if (layer->region.isRect()) { composeLayerRect(layer, layer->regionRect); } else if (layer->mesh) { const float a = layer->getAlpha() / 255.0f; - SkiaColorFilter *oldFilter = mColorFilter; - mColorFilter = layer->getColorFilter(); - setupDraw(); setupDrawWithTexture(); setupDrawColor(a, a, a, a); @@ -2764,13 +2764,13 @@ status_t OpenGLRenderer::drawLayer(Layer* layer, float x, float y, SkPaint* pain finishDrawTexture(); - mColorFilter = oldFilter; - #if DEBUG_LAYERS_AS_REGIONS drawRegionRects(layer->region); #endif } + mColorFilter = oldFilter; + if (debugLayerUpdate) { drawColorRect(x, y, x + layer->layer.getWidth(), y + layer->layer.getHeight(), 0x7f00ff00, SkXfermode::kSrcOver_Mode); |