drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 59e129fb: Merge "Account for colorfilter transparency in determining paint opacity" into lmp-mr1-dev

Browse Source 
* commit '59e129fbc8a70d58d124ccc309661719f562b486':
  Account for colorfilter transparency in determining paint opacity
This commit is contained in:
Chris Craik
2014-10-02 19:33:13 +00:00
committed by Android Git Automerger
parent 6e5f114f52 59e129fbc8
commit 00d96e7dd1
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/hwui/DisplayListOp.h
View File

@ -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;
}
}

7
libs/hwui/OpenGLRenderer.cpp
View File

@ -1734,13 +1734,6 @@ void OpenGLRenderer::accountForClear(SkXfermode::Mode mode) {
}
}
static bool isBlendedColorFilter(const SkColorFilter* filter) {
if (filter == NULL) {
return false;
}
return (filter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag) == 0;
}
void OpenGLRenderer::setupDrawBlending(const Layer* layer, bool swapSrcDst) {
SkXfermode::Mode mode = layer->getMode();
// When the blending mode is kClear_Mode, we need to use a modulate color

11
libs/hwui/Renderer.h
View File

@ -17,12 +17,13 @@
#ifndef ANDROID_HWUI_RENDERER_H
#define ANDROID_HWUI_RENDERER_H
#include <SkColorFilter.h>
#include <SkPaint.h>
#include <SkRegion.h>
#include <utils/String8.h>
#include "AssetAtlas.h"
#include "SkPaint.h"
namespace android {
@ -81,6 +82,14 @@ public:
&& !paint.getColorFilter()
&& getXfermode(paint.getXfermode()) == SkXfermode::kSrcOver_Mode;
}
static bool isBlendedColorFilter(const SkColorFilter* filter) {
if (filter == NULL) {
return false;
}
return (filter->getFlags() & SkColorFilter::kAlphaUnchanged_Flag) == 0;
}
// ----------------------------------------------------------------------------
// Frame state operations
// ----------------------------------------------------------------------------