diff options
| author | Chris Craik <ccraik@google.com> | 2013-03-20 22:22:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-20 22:22:44 +0000 |
| commit | 4494599e5a4931426d5649e1d1c4f9db83824ae8 (patch) | |
| tree | 987a2176952a5e871b80d2f9ab0468be9fb24d7d /libs/hwui/OpenGLRenderer.cpp | |
| parent | fd81f91052d54c0354834fcd4f423025f2d8c93e (diff) | |
| parent | a08f95cfeca7217f9c533b03663bf0dceedd259a (diff) | |
| download | frameworks_base-4494599e5a4931426d5649e1d1c4f9db83824ae8.zip frameworks_base-4494599e5a4931426d5649e1d1c4f9db83824ae8.tar.gz frameworks_base-4494599e5a4931426d5649e1d1c4f9db83824ae8.tar.bz2 | |
Merge "Use snapshot alpha for layers" into jb-mr2-dev
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index e31f6f6..8030d66 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2827,7 +2827,7 @@ status_t OpenGLRenderer::drawPath(SkPath* path, SkPaint* paint) { return DrawGlInfo::kStatusDrew; } -status_t OpenGLRenderer::drawLayer(Layer* layer, float x, float y, SkPaint* paint) { +status_t OpenGLRenderer::drawLayer(Layer* layer, float x, float y) { if (!layer) { return DrawGlInfo::kStatusDone; } @@ -2865,7 +2865,7 @@ status_t OpenGLRenderer::drawLayer(Layer* layer, float x, float y, SkPaint* pain if (layer->region.isRect()) { composeLayerRect(layer, layer->regionRect); } else if (layer->mesh) { - const float a = layer->getAlpha() / 255.0f; + const float a = layer->getAlpha() / 255.0f * mSnapshot->alpha; setupDraw(); setupDrawWithTexture(); setupDrawColor(a, a, a, a); @@ -2972,12 +2972,8 @@ void OpenGLRenderer::setupPaintFilter(int clearBits, int setBits) { mDrawModifiers.mPaintFilterSetBits = setBits & SkPaint::kAllFlags; } -SkPaint* OpenGLRenderer::filterPaint(SkPaint* paint, bool alwaysCopy) { +SkPaint* OpenGLRenderer::filterPaint(SkPaint* paint) { if (CC_LIKELY(!mDrawModifiers.mHasDrawFilter || !paint)) { - if (CC_UNLIKELY(alwaysCopy)) { - mFilteredPaint = *paint; - return &mFilteredPaint; - } return paint; } |