Correctly implement the CLEAR xfermode.
The previous implementation was using glBlendFunc with the parameters
GL_ZERO/GL_ZERO which doesn't work for text, paths and other alpha
sources (anti-aliasing.) The correct implementation is GL_ZERO/
GL_ONE_MINUS_SRC_ALPHA.
Change-Id: I4cca65e57b6a37bbf5a41d382cb0648ee8e11e79
diff --git a/libs/hwui/Debug.h b/libs/hwui/Debug.h
index f74238e..2cdc8c3 100644
--- a/libs/hwui/Debug.h
+++ b/libs/hwui/Debug.h
@@ -37,6 +37,8 @@
// Turn on to display debug info about 9patch objects
#define DEBUG_PATCHES 0
+// Turn on to "explode" 9patch objects
+#define DEBUG_EXPLODE_PATCHES 0
// Turn on to display vertex and tex coords data about 9patch objects
// This flag requires DEBUG_PATCHES to be turned on
#define DEBUG_PATCHES_VERTICES 0
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 560c1f9..8cf325b 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -63,7 +63,7 @@
// In this array, the index of each Blender equals the value of the first
// entry. For instance, gBlends[1] == gBlends[SkXfermode::kSrc_Mode]
static const Blender gBlends[] = {
- { SkXfermode::kClear_Mode, GL_ZERO, GL_ZERO },
+ { SkXfermode::kClear_Mode, GL_ZERO, GL_ONE_MINUS_SRC_ALPHA },
{ SkXfermode::kSrc_Mode, GL_ONE, GL_ZERO },
{ SkXfermode::kDst_Mode, GL_ZERO, GL_ONE },
{ SkXfermode::kSrcOver_Mode, GL_ONE, GL_ONE_MINUS_SRC_ALPHA },
@@ -81,7 +81,7 @@
// this array's SrcOver blending mode is actually DstOver. You can refer to
// createLayer() for more information on the purpose of this array.
static const Blender gBlendsSwap[] = {
- { SkXfermode::kClear_Mode, GL_ZERO, GL_ZERO },
+ { SkXfermode::kClear_Mode, GL_ONE_MINUS_DST_ALPHA, GL_ZERO },
{ SkXfermode::kSrc_Mode, GL_ZERO, GL_ONE },
{ SkXfermode::kDst_Mode, GL_ONE, GL_ZERO },
{ SkXfermode::kSrcOver_Mode, GL_ONE_MINUS_DST_ALPHA, GL_ONE },
diff --git a/libs/hwui/Patch.cpp b/libs/hwui/Patch.cpp
index 11eb953..f7dacae 100644
--- a/libs/hwui/Patch.cpp
+++ b/libs/hwui/Patch.cpp
@@ -152,12 +152,12 @@
float previousStepY = 0.0f;
float y1 = 0.0f;
+ float y2 = 0.0f;
float v1 = 0.0f;
for (uint32_t i = 0; i < mYCount; i++) {
float stepY = mYDivs[i];
- float y2 = 0.0f;
if (i & 1) {
const float segment = stepY - previousStepY;
y2 = y1 + floorf(segment * stretchY + 0.5f);
@@ -167,8 +167,15 @@
float v2 = fmax(0.0f, stepY - 0.5f) / bitmapHeight;
if (stepY > 0.0f) {
+#if DEBUG_EXPLODE_PATCHES
+ y1 += i * EXPLODE_GAP;
+ y2 += i * EXPLODE_GAP;
+#endif
generateRow(vertex, y1, y2, v1, v2, stretchX, right - left,
bitmapWidth, quadCount);
+#if DEBUG_EXPLODE_PATCHES
+ y2 -= i * EXPLODE_GAP;
+#endif
}
y1 = y2;
@@ -178,7 +185,12 @@
}
if (previousStepY != bitmapHeight) {
- generateRow(vertex, y1, bottom - top, v1, 1.0f, stretchX, right - left,
+ y2 = bottom - top;
+#if DEBUG_EXPLODE_PATCHES
+ y1 += mYCount * EXPLODE_GAP;
+ y2 += mYCount * EXPLODE_GAP;
+#endif
+ generateRow(vertex, y1, y2, v1, 1.0f, stretchX, right - left,
bitmapWidth, quadCount);
}
@@ -202,13 +214,13 @@
float previousStepX = 0.0f;
float x1 = 0.0f;
+ float x2 = 0.0f;
float u1 = 0.0f;
// Generate the row quad by quad
for (uint32_t i = 0; i < mXCount; i++) {
float stepX = mXDivs[i];
- float x2 = 0.0f;
if (i & 1) {
const float segment = stepX - previousStepX;
x2 = x1 + floorf(segment * stretchX + 0.5f);
@@ -218,7 +230,14 @@
float u2 = fmax(0.0f, stepX - 0.5f) / bitmapWidth;
if (stepX > 0.0f) {
+#if DEBUG_EXPLODE_PATCHES
+ x1 += i * EXPLODE_GAP;
+ x2 += i * EXPLODE_GAP;
+#endif
generateQuad(vertex, x1, y1, x2, y2, u1, v1, u2, v2, quadCount);
+#if DEBUG_EXPLODE_PATCHES
+ x2 -= i * EXPLODE_GAP;
+#endif
}
x1 = x2;
@@ -228,7 +247,12 @@
}
if (previousStepX != bitmapWidth) {
- generateQuad(vertex, x1, y1, width, y2, u1, v1, 1.0f, v2, quadCount);
+ x2 = width;
+#if DEBUG_EXPLODE_PATCHES
+ x1 += mXCount * EXPLODE_GAP;
+ x2 += mXCount * EXPLODE_GAP;
+#endif
+ generateQuad(vertex, x1, y1, x2, y2, u1, v1, 1.0f, v2, quadCount);
}
}
diff --git a/libs/hwui/Patch.h b/libs/hwui/Patch.h
index 0f0ffa2..28c9048 100644
--- a/libs/hwui/Patch.h
+++ b/libs/hwui/Patch.h
@@ -31,6 +31,12 @@
namespace uirenderer {
///////////////////////////////////////////////////////////////////////////////
+// Defines
+///////////////////////////////////////////////////////////////////////////////
+
+#define EXPLODE_GAP 4
+
+///////////////////////////////////////////////////////////////////////////////
// 9-patch structures
///////////////////////////////////////////////////////////////////////////////
diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml
index 35f2b9b..01d30eb 100644
--- a/tests/HwAccelerationTest/AndroidManifest.xml
+++ b/tests/HwAccelerationTest/AndroidManifest.xml
@@ -30,6 +30,15 @@
android:hardwareAccelerated="true">
<activity
+ android:name="ClearActivity"
+ android:label="_Clear">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ <activity
android:name="TextureViewActivity"
android:label="_TextureView">
<intent-filter>
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java
new file mode 100644
index 0000000..1d7ff0f
--- /dev/null
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/ClearActivity.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.test.hwui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.os.Bundle;
+import android.view.View;
+
+@SuppressWarnings({"UnusedDeclaration"})
+public class ClearActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ final PathsView view = new PathsView(this);
+ setContentView(view);
+ }
+
+ public static class PathsView extends View {
+ private final Bitmap mBitmap1;
+ private final Paint mClearPaint;
+ private final Path mPath;
+
+ public PathsView(Context c) {
+ super(c);
+
+ mBitmap1 = BitmapFactory.decodeResource(c.getResources(), R.drawable.sunset2);
+
+ mClearPaint = new Paint();
+ mClearPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+ mClearPaint.setAntiAlias(true);
+ mClearPaint.setColor(0xff00ff00);
+ mClearPaint.setStrokeWidth(15.0f);
+ mClearPaint.setStyle(Paint.Style.FILL);
+ mClearPaint.setTextSize(32.0f);
+
+ mPath = new Path();
+ mPath.moveTo(0.0f, 0.0f);
+ mPath.cubicTo(0.0f, 0.0f, 100.0f, 150.0f, 100.0f, 200.0f);
+ mPath.cubicTo(100.0f, 200.0f, 50.0f, 300.0f, -80.0f, 200.0f);
+ mPath.cubicTo(-80.0f, 200.0f, 100.0f, 200.0f, 200.0f, 0.0f);
+
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ super.onDraw(canvas);
+
+ canvas.save(); {
+ canvas.drawARGB(255, 255, 255, 255);
+ canvas.drawRect(100.0f, 100.0f, 200.0f, 200.0f, mClearPaint);
+ canvas.drawCircle(150.0f, 400.0f, 100.0f, mClearPaint);
+ canvas.drawBitmap(mBitmap1, 400.0f, 100.0f, mClearPaint);
+ canvas.save(); {
+ canvas.translate(400.0f, 400.0f);
+ canvas.drawPath(mPath, mClearPaint);
+ }
+ canvas.restore();
+ canvas.drawText("OpenGLRenderer", 50.0f, 50.0f, mClearPaint);
+ }
+ canvas.restore();
+ }
+ }
+}