Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix oval positioning when drawn with patheffect" into nyc-dev

Browse Source
This commit is contained in:
Chris Craik
2016-04-27 20:52:49 +00:00
committed by Android (Google) Code Review
parent 0d7bddcbde e98a046d31
commit 8438a7297c
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/BakedOpDispatcher.cpp
View File

@@ -569,7 +569,7 @@ void BakedOpDispatcher::onOvalOp(BakedOpRenderer& renderer, const OvalOp& op, co
op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight(), op.paint); op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight(), op.paint);
const AutoTexture holder(texture); const AutoTexture holder(texture);
if (CC_LIKELY(holder.texture)) { if (CC_LIKELY(holder.texture)) {
renderPathTexture(renderer, state, op.unmappedBounds.left, op.unmappedBounds.right, renderPathTexture(renderer, state, op.unmappedBounds.left, op.unmappedBounds.top,
*texture, *(op.paint)); *texture, *(op.paint));
} }
} else { } else {

26
libs/hwui/tests/unit/BakedOpDispatcherTests.cpp
View File

@@ -21,6 +21,8 @@
#include <BakedOpRenderer.h> #include <BakedOpRenderer.h>
#include <tests/common/TestUtils.h> #include <tests/common/TestUtils.h>
#include <SkDashPathEffect.h>
using namespace android::uirenderer; using namespace android::uirenderer;
static BakedOpRenderer::LightInfo sLightInfo; static BakedOpRenderer::LightInfo sLightInfo;
@@ -71,12 +73,17 @@ static void testUnmergedGlopDispatch(renderthread::RenderThread& renderThread, R
ASSERT_EQ(1, glopCount) << "Exactly one Glop expected"; ASSERT_EQ(1, glopCount) << "Exactly one Glop expected";
} }
RENDERTHREAD_TEST(BakedOpDispatcher, onArc_position) { RENDERTHREAD_TEST(BakedOpDispatcher, pathTexture_positionOvalArc) {
SkPaint strokePaint; SkPaint strokePaint;
strokePaint.setStyle(SkPaint::kStroke_Style); strokePaint.setStyle(SkPaint::kStroke_Style);
strokePaint.setStrokeWidth(4); strokePaint.setStrokeWidth(4);
ArcOp op(Rect(10, 15, 20, 25), Matrix4::identity(), nullptr, &strokePaint, 0, 270, true);
testUnmergedGlopDispatch(renderThread, &op, [] (const Glop& glop) { float intervals[] = {1.0f, 1.0f};
auto dashEffect = SkDashPathEffect::Create(intervals, 2, 0);
strokePaint.setPathEffect(dashEffect);
dashEffect->unref();
auto textureGlopVerifier = [] (const Glop& glop) {
// validate glop produced by renderPathTexture (so texture, unit quad) // validate glop produced by renderPathTexture (so texture, unit quad)
auto texture = glop.fill.texture.texture; auto texture = glop.fill.texture.texture;
ASSERT_NE(nullptr, texture); ASSERT_NE(nullptr, texture);
@@ -85,15 +92,20 @@ RENDERTHREAD_TEST(BakedOpDispatcher, onArc_position) {
<< "Should see conservative offset from PathCache::computeBounds"; << "Should see conservative offset from PathCache::computeBounds";
Rect expectedBounds(10, 15, 20, 25); Rect expectedBounds(10, 15, 20, 25);
expectedBounds.outset(expectedOffset); expectedBounds.outset(expectedOffset);
#if !HWUI_NEW_OPS
EXPECT_EQ(expectedBounds, glop.bounds) << "bounds outset by stroke 'offset'";
#endif
Matrix4 expectedModelView; Matrix4 expectedModelView;
expectedModelView.loadTranslate(10 - expectedOffset, 15 - expectedOffset, 0); expectedModelView.loadTranslate(10 - expectedOffset, 15 - expectedOffset, 0);
expectedModelView.scale(10 + 2 * expectedOffset, 10 + 2 * expectedOffset, 1); expectedModelView.scale(10 + 2 * expectedOffset, 10 + 2 * expectedOffset, 1);
EXPECT_EQ(expectedModelView, glop.transform.modelView) EXPECT_EQ(expectedModelView, glop.transform.modelView)
<< "X and Y offsets, and scale both applied to model view"; << "X and Y offsets, and scale both applied to model view";
}); };
// Arc and Oval will render functionally the same glop, differing only in texture content
ArcOp arcOp(Rect(10, 15, 20, 25), Matrix4::identity(), nullptr, &strokePaint, 0, 270, true);
testUnmergedGlopDispatch(renderThread, &arcOp, textureGlopVerifier);
OvalOp ovalOp(Rect(10, 15, 20, 25), Matrix4::identity(), nullptr, &strokePaint);
testUnmergedGlopDispatch(renderThread, &ovalOp, textureGlopVerifier);
} }
RENDERTHREAD_TEST(BakedOpDispatcher, onLayerOp_bufferless) { RENDERTHREAD_TEST(BakedOpDispatcher, onLayerOp_bufferless) {