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

Fix complex clipping on mergeable ops DO NOT MERGE

Browse Source 
am: d183e0b988

Change-Id: Icb357a11cb8a4be473aa8b0acdb4d799973ff54a
This commit is contained in:
Chris Craik
2016-10-17 19:52:53 +00:00
committed by android-build-merger
parent 4a6e246671 d183e0b988
commit a6bfd8d12c
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/FrameBuilder.cpp
View File

@@ -591,7 +591,7 @@ void FrameBuilder::deferArcOp(const ArcOp& op) {
}
static bool hasMergeableClip(const BakedOpState& state) {
return state.computedState.clipState
return !state.computedState.clipState
|| state.computedState.clipState->mode == ClipMode::Rectangle;
}

29
libs/hwui/tests/unit/FrameBuilderTests.cpp
View File

@@ -477,6 +477,35 @@ RENDERTHREAD_TEST(FrameBuilder, clippedMerging) {
EXPECT_EQ(4, renderer.getIndex());
}
RENDERTHREAD_TEST(FrameBuilder, regionClipStopsMerge) {
class RegionClipStopsMergeTestRenderer : public TestRendererBase {
public:
void onTextOp(const TextOp& op, const BakedOpState& state) override { mIndex++; }
};
auto node = TestUtils::createNode(0, 0, 400, 400,
[](RenderProperties& props, TestCanvas& canvas) {
SkPath path;
path.addCircle(200, 200, 200, SkPath::kCW_Direction);
canvas.save(SaveFlags::MatrixClip);
canvas.clipPath(&path, SkRegion::kIntersect_Op);
SkPaint paint;
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
paint.setAntiAlias(true);
paint.setTextSize(50);
TestUtils::drawUtf8ToCanvas(&canvas, "Test string1", paint, 100, 100);
TestUtils::drawUtf8ToCanvas(&canvas, "Test string1", paint, 100, 200);
canvas.restore();
});
FrameBuilder frameBuilder(SkRect::MakeWH(400, 400), 400, 400,
sLightGeometry, Caches::getInstance());
frameBuilder.deferRenderNode(*TestUtils::getSyncedNode(node));
RegionClipStopsMergeTestRenderer renderer;
frameBuilder.replayBakedOps<TestDispatcher>(renderer);
EXPECT_EQ(2, renderer.getIndex());
}
RENDERTHREAD_TEST(FrameBuilder, textMerging) {
class TextMergingTestRenderer : public TestRendererBase {
public: