diff options
| author | Chris Craik <ccraik@google.com> | 2014-10-02 19:28:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 19:28:09 +0000 |
| commit | 59e129fbc8a70d58d124ccc309661719f562b486 (patch) | |
| tree | e652f2698ee8d989be6b68111939fb6ab0347202 /libs/hwui/DisplayListOp.h | |
| parent | 6062a09dbc1c26cacb6fa2dac7467ae826b70229 (diff) | |
| parent | c5b5f0556b542a22f01d254e6284f69e9eb23e74 (diff) | |
| download | frameworks_base-59e129fbc8a70d58d124ccc309661719f562b486.zip frameworks_base-59e129fbc8a70d58d124ccc309661719f562b486.tar.gz frameworks_base-59e129fbc8a70d58d124ccc309661719f562b486.tar.bz2 | |
Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev
Diffstat (limited to 'libs/hwui/DisplayListOp.h')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index cb3ef9b..d78c1cb 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -212,10 +212,13 @@ protected: // check state/paint for transparency if (mPaint) { + if (mPaint->getAlpha() != 0xFF) { + return false; + } if (mPaint->getShader() && !mPaint->getShader()->isOpaque()) { return false; } - if (mPaint->getAlpha() != 0xFF) { + if (Renderer::isBlendedColorFilter(mPaint->getColorFilter())) { return false; } } |