Merge "Fix issue with drawColor(color, Mode.Clear)"

3 files changed, 16 insertions, 1 deletions

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 8e9e8bebfad8..6243b015e61b 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -990,12 +990,26 @@ void OpenGLRenderer::setupDrawColorFilter() {
     }
 }
 
+void OpenGLRenderer::accountForClear(SkXfermode::Mode mode) {
+    if (mColorSet && mode == SkXfermode::kClear_Mode) {
+        mColorA = 1.0f;
+        mColorR = mColorG = mColorB = 0.0f;
+        mSetShaderColor = mDescription.setAlpha8Color(mColorR, mColorG, mColorB, mColorA);
+    }
+}
+
 void OpenGLRenderer::setupDrawBlending(SkXfermode::Mode mode, bool swapSrcDst) {
+    // When the blending mode is kClear_Mode, we need to use a modulate color
+    // argb=1,0,0,0
+    accountForClear(mode);
     chooseBlending((mColorSet && mColorA < 1.0f) || (mShader && mShader->blend()), mode,
             mDescription, swapSrcDst);
 }
 
 void OpenGLRenderer::setupDrawBlending(bool blend, SkXfermode::Mode mode, bool swapSrcDst) {
+    // When the blending mode is kClear_Mode, we need to use a modulate color
+    // argb=1,0,0,0
+    accountForClear(mode);
     chooseBlending(blend || (mColorSet && mColorA < 1.0f) || (mShader && mShader->blend()), mode,
             mDescription, swapSrcDst);
 }
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index 70abe88b2e92..e2dbba0f7828 100644
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -478,6 +478,7 @@ private:
     void setupDrawAALine(GLvoid* vertices, GLvoid* distanceCoords, GLvoid* lengthCoords,
             float strokeWidth);
     void finishDrawTexture();
+    void accountForClear(SkXfermode::Mode mode);
 
     void drawRegionRects(const Region& region);
 
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java
index 1d7ff0fad414..b49db7c571f1 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java
@@ -51,7 +51,7 @@ public class ClearActivity extends Activity {
             mClearPaint = new Paint();
             mClearPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
             mClearPaint.setAntiAlias(true);
-            mClearPaint.setColor(0xff00ff00);
+            mClearPaint.setColor(0x0000ff00);
             mClearPaint.setStrokeWidth(15.0f);
             mClearPaint.setStyle(Paint.Style.FILL);
             mClearPaint.setTextSize(32.0f);