diff options
-rw-r--r-- | libs/hwui/BakedOpDispatcher.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/FontRenderer.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/GlopBuilder.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 10 | ||||
-rw-r--r-- | libs/hwui/RecordedOp.h | 2 | ||||
-rw-r--r-- | libs/hwui/RecordingCanvas.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/tests/unit/BakedOpStateTests.cpp | 4 | ||||
-rw-r--r-- | libs/hwui/tests/unit/CanvasStateTests.cpp | 12 | ||||
-rw-r--r-- | libs/hwui/tests/unit/OpReordererTests.cpp | 22 | ||||
-rw-r--r-- | libs/hwui/tests/unit/RecordingCanvasTests.cpp | 28 |
10 files changed, 43 insertions, 43 deletions
diff --git a/libs/hwui/BakedOpDispatcher.cpp b/libs/hwui/BakedOpDispatcher.cpp index f1c89b895048..34330687ead6 100644 --- a/libs/hwui/BakedOpDispatcher.cpp +++ b/libs/hwui/BakedOpDispatcher.cpp @@ -406,7 +406,7 @@ void BakedOpDispatcher::onBitmapOp(BakedOpRenderer& renderer, const BitmapOp& op .setMeshTexturedUnitQuad(texture->uvMapper) .setFillTexturePaint(*texture, textureFillFlags, op.paint, state.alpha) .setTransform(state.computedState.transform, TransformFlags::None) - .setModelViewMapUnitToRectSnap(Rect(0, 0, texture->width, texture->height)) + .setModelViewMapUnitToRectSnap(Rect(texture->width, texture->height)) .build(); renderer.renderGlop(state, glop); } diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 8acdb624a1ce..ed31a2c27121 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -83,7 +83,7 @@ void TextDrawFunctor::draw(CacheTexture& texture, bool linearFiltering) { .setMeshTexturedIndexedQuads(texture.mesh(), texture.meshElementCount()) .setFillTexturePaint(texture.getTexture(), textureFillFlags, paint, renderer->currentSnapshot()->alpha) .setTransform(*(renderer->currentSnapshot()), transformFlags) - .setModelViewOffsetRect(0, 0, Rect(0, 0, 0, 0)) + .setModelViewOffsetRect(0, 0, Rect()) .build(); renderer->renderGlop(glop); #endif diff --git a/libs/hwui/GlopBuilder.cpp b/libs/hwui/GlopBuilder.cpp index f3ac93b89893..2507ff377133 100644 --- a/libs/hwui/GlopBuilder.cpp +++ b/libs/hwui/GlopBuilder.cpp @@ -101,7 +101,7 @@ GlopBuilder& GlopBuilder::setMeshUnitQuad() { GlopBuilder& GlopBuilder::setMeshTexturedUnitQuad(const UvMapper* uvMapper) { if (uvMapper) { // can't use unit quad VBO, so build UV vertices manually - return setMeshTexturedUvQuad(uvMapper, Rect(0, 0, 1, 1)); + return setMeshTexturedUvQuad(uvMapper, Rect(1, 1)); } TRIGGER_STAGE(kMeshStage); diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index f49237c9c069..92b758de8200 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1474,7 +1474,7 @@ void OpenGLRenderer::drawBitmaps(const SkBitmap* bitmap, AssetAtlas::Entry* entr .setMeshTexturedMesh(vertices, bitmapCount * 6) .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha) .setTransform(*currentSnapshot(), transformFlags) - .setModelViewOffsetRectOptionalSnap(snap, x, y, Rect(0, 0, bounds.getWidth(), bounds.getHeight())) + .setModelViewOffsetRectOptionalSnap(snap, x, y, Rect(bounds.getWidth(), bounds.getHeight())) .build(); renderGlop(glop, GlopRenderType::Multi); } @@ -1497,7 +1497,7 @@ void OpenGLRenderer::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) { .setMeshTexturedUnitQuad(texture->uvMapper) .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha) .setTransform(*currentSnapshot(), TransformFlags::None) - .setModelViewMapUnitToRectSnap(Rect(0, 0, texture->width, texture->height)) + .setModelViewMapUnitToRectSnap(Rect(texture->width, texture->height)) .build(); renderGlop(glop); } @@ -1642,7 +1642,7 @@ void OpenGLRenderer::drawPatch(const SkBitmap* bitmap, const Patch* mesh, .setMeshPatchQuads(*mesh) .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha) .setTransform(*currentSnapshot(), TransformFlags::None) - .setModelViewOffsetRectSnap(left, top, Rect(0, 0, right - left, bottom - top)) // TODO: get minimal bounds from patch + .setModelViewOffsetRectSnap(left, top, Rect(right - left, bottom - top)) // TODO: get minimal bounds from patch .build(); renderGlop(glop); } @@ -1672,7 +1672,7 @@ void OpenGLRenderer::drawPatches(const SkBitmap* bitmap, AssetAtlas::Entry* entr .setMeshTexturedIndexedQuads(vertices, elementCount) .setFillTexturePaint(*texture, textureFillFlags, paint, currentSnapshot()->alpha) .setTransform(*currentSnapshot(), transformFlags) - .setModelViewOffsetRect(0, 0, Rect(0, 0, 0, 0)) + .setModelViewOffsetRect(0, 0, Rect()) .build(); renderGlop(glop, GlopRenderType::Multi); } @@ -2268,7 +2268,7 @@ void OpenGLRenderer::drawLayer(Layer* layer) { .setMeshTexturedIndexedQuads(layer->mesh, layer->meshElementCount) .setFillLayer(layer->getTexture(), layer->getColorFilter(), getLayerAlpha(layer), layer->getMode(), Blend::ModeOrderSwap::NoSwap) .setTransform(*currentSnapshot(), TransformFlags::None) - .setModelViewOffsetRectSnap(0, 0, Rect(0, 0, layer->layer.getWidth(), layer->layer.getHeight())) + .setModelViewOffsetRectSnap(0, 0, Rect(layer->layer.getWidth(), layer->layer.getHeight())) .build(); DRAW_DOUBLE_STENCIL_IF(!layer->hasDrawnSinceUpdate, renderGlop(glop)); #if DEBUG_LAYERS_AS_REGIONS diff --git a/libs/hwui/RecordedOp.h b/libs/hwui/RecordedOp.h index 75ecdae3aa6f..1424c8e757d5 100644 --- a/libs/hwui/RecordedOp.h +++ b/libs/hwui/RecordedOp.h @@ -310,7 +310,7 @@ struct BeginLayerOp : RecordedOp { */ struct EndLayerOp : RecordedOp { EndLayerOp() - : RecordedOp(RecordedOpId::EndLayerOp, Rect(0, 0), Matrix4::identity(), Rect(0, 0), nullptr) {} + : RecordedOp(RecordedOpId::EndLayerOp, Rect(), Matrix4::identity(), Rect(), nullptr) {} }; /** diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp index 57f0d349172c..4825ba3329b9 100644 --- a/libs/hwui/RecordingCanvas.cpp +++ b/libs/hwui/RecordingCanvas.cpp @@ -473,7 +473,7 @@ void RecordingCanvas::drawTextOnPath(const uint16_t* glyphs, int count, const Sk void RecordingCanvas::drawBitmap(const SkBitmap* bitmap, const SkPaint* paint) { addOp(new (alloc()) BitmapOp( - Rect(0, 0, bitmap->width(), bitmap->height()), + Rect(bitmap->width(), bitmap->height()), *(mState.currentSnapshot()->transform), mState.getRenderTargetClipBounds(), refPaint(paint), refBitmap(*bitmap))); diff --git a/libs/hwui/tests/unit/BakedOpStateTests.cpp b/libs/hwui/tests/unit/BakedOpStateTests.cpp index 8321ff92268c..33eff5ba2da0 100644 --- a/libs/hwui/tests/unit/BakedOpStateTests.cpp +++ b/libs/hwui/tests/unit/BakedOpStateTests.cpp @@ -34,7 +34,7 @@ TEST(ResolvedRenderState, construct) { auto parentSnapshot = TestUtils::makeSnapshot(Matrix4::identity(), Rect(100, 200)); ResolvedRenderState state(*parentSnapshot, recordedOp, false); EXPECT_MATRIX_APPROX_EQ(state.transform, translate10x20); - EXPECT_EQ(Rect(0, 0, 100, 200), state.clipRect); + EXPECT_EQ(Rect(100, 200), state.clipRect); EXPECT_EQ(Rect(40, 60, 100, 200), state.clippedBounds); // translated and also clipped EXPECT_EQ(OpClipSideFlags::Right | OpClipSideFlags::Bottom, state.clipSideFlags); } @@ -196,7 +196,7 @@ TEST(BakedOpState, tryStrokeableOpConstruct) { SkPaint paint; paint.setStyle(SkPaint::kStrokeAndFill_Style); paint.setStrokeWidth(0.0f); - RectOp rejectOp(Rect(0, 0, 100, 200), Matrix4::identity(), Rect(100, 200), &paint); + RectOp rejectOp(Rect(100, 200), Matrix4::identity(), Rect(100, 200), &paint); auto snapshot = TestUtils::makeSnapshot(Matrix4::identity(), Rect()); // Note: empty clip auto bakedState = BakedOpState::tryStrokeableOpConstruct(allocator, *snapshot, rejectOp, BakedOpState::StrokeBehavior::StyleDefined); diff --git a/libs/hwui/tests/unit/CanvasStateTests.cpp b/libs/hwui/tests/unit/CanvasStateTests.cpp index dfbf6d358ce5..4df2687394fa 100644 --- a/libs/hwui/tests/unit/CanvasStateTests.cpp +++ b/libs/hwui/tests/unit/CanvasStateTests.cpp @@ -57,7 +57,7 @@ TEST(CanvasState, gettersAndSetters) { simpleTranslate.loadTranslate(10, 20, 0); state.setMatrix(simpleTranslate); - ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(0, 0, 200, 200)); + ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(200, 200)); ASSERT_EQ(state.getLocalClipBounds(), Rect(-10, -20, 190, 180)); EXPECT_TRUE(approxEqual(*state.currentTransform(), simpleTranslate)); EXPECT_TRUE(state.clipIsSimple()); @@ -69,7 +69,7 @@ TEST(CanvasState, simpleClipping) { 0, 0, 200, 200, Vector3()); state.clipRect(0, 0, 100, 100, SkRegion::kIntersect_Op); - ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(0, 0, 100, 100)); + ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(100, 100)); state.clipRect(10, 10, 200, 200, SkRegion::kIntersect_Op); ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(10, 10, 100, 100)); @@ -122,10 +122,10 @@ TEST(CanvasState, saveAndRestore) { state.save(SkCanvas::kClip_SaveFlag); { state.clipRect(0, 0, 10, 10, SkRegion::kIntersect_Op); - ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(0, 0, 10, 10)); + ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(10, 10)); } state.restore(); - ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(0, 0, 200, 200)); // verify restore + ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(200, 200)); // verify restore Matrix4 simpleTranslate; simpleTranslate.loadTranslate(10, 10, 0); @@ -146,10 +146,10 @@ TEST(CanvasState, saveAndRestoreButNotTooMuch) { state.save(SkCanvas::kMatrix_SaveFlag); // NOTE: clip not saved { state.clipRect(0, 0, 10, 10, SkRegion::kIntersect_Op); - ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(0, 0, 10, 10)); + ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(10, 10)); } state.restore(); - ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(0, 0, 10, 10)); // verify not restored + ASSERT_EQ(state.getRenderTargetClipBounds(), Rect(10, 10)); // verify not restored Matrix4 simpleTranslate; simpleTranslate.loadTranslate(10, 10, 0); diff --git a/libs/hwui/tests/unit/OpReordererTests.cpp b/libs/hwui/tests/unit/OpReordererTests.cpp index 5eac498a3816..ac356a47c87c 100644 --- a/libs/hwui/tests/unit/OpReordererTests.cpp +++ b/libs/hwui/tests/unit/OpReordererTests.cpp @@ -259,7 +259,7 @@ TEST(OpReorderer, renderNode) { void onRectOp(const RectOp& op, const BakedOpState& state) override { switch(mIndex++) { case 0: - EXPECT_EQ(Rect(0, 0, 200, 200), state.computedState.clippedBounds); + EXPECT_EQ(Rect(200, 200), state.computedState.clippedBounds); EXPECT_EQ(SK_ColorDKGRAY, op.paint->getColor()); break; case 1: @@ -337,8 +337,8 @@ TEST(OpReorderer, saveLayerSimple) { void onRectOp(const RectOp& op, const BakedOpState& state) override { EXPECT_EQ(1, mIndex++); EXPECT_EQ(Rect(10, 10, 190, 190), op.unmappedBounds); - EXPECT_EQ(Rect(0, 0, 180, 180), state.computedState.clippedBounds); - EXPECT_EQ(Rect(0, 0, 180, 180), state.computedState.clipRect); + EXPECT_EQ(Rect(180, 180), state.computedState.clippedBounds); + EXPECT_EQ(Rect(180, 180), state.computedState.clipRect); Matrix4 expectedTransform; expectedTransform.loadTranslate(-10, -10, 0); @@ -347,7 +347,7 @@ TEST(OpReorderer, saveLayerSimple) { void onLayerOp(const LayerOp& op, const BakedOpState& state) override { EXPECT_EQ(3, mIndex++); EXPECT_EQ(Rect(10, 10, 190, 190), state.computedState.clippedBounds); - EXPECT_EQ(Rect(0, 0, 200, 200), state.computedState.clipRect); + EXPECT_EQ(Rect(200, 200), state.computedState.clipRect); EXPECT_TRUE(state.computedState.transform.isIdentity()); } }; @@ -399,19 +399,19 @@ TEST(OpReorderer, saveLayerNested) { void onRectOp(const RectOp& op, const BakedOpState& state) override { const int index = mIndex++; if (index == 1) { - EXPECT_EQ(Rect(0, 0, 400, 400), op.unmappedBounds); // inner rect + EXPECT_EQ(Rect(400, 400), op.unmappedBounds); // inner rect } else if (index == 4) { - EXPECT_EQ(Rect(0, 0, 800, 800), op.unmappedBounds); // outer rect + EXPECT_EQ(Rect(800, 800), op.unmappedBounds); // outer rect } else { ADD_FAILURE(); } } void onLayerOp(const LayerOp& op, const BakedOpState& state) override { const int index = mIndex++; if (index == 5) { EXPECT_EQ((OffscreenBuffer*)0x400, *op.layerHandle); - EXPECT_EQ(Rect(0, 0, 400, 400), op.unmappedBounds); // inner layer + EXPECT_EQ(Rect(400, 400), op.unmappedBounds); // inner layer } else if (index == 8) { EXPECT_EQ((OffscreenBuffer*)0x800, *op.layerHandle); - EXPECT_EQ(Rect(0, 0, 800, 800), op.unmappedBounds); // outer layer + EXPECT_EQ(Rect(800, 800), op.unmappedBounds); // outer layer } else { ADD_FAILURE(); } } }; @@ -1091,7 +1091,7 @@ TEST(OpReorderer, renderPropSaveLayerAlphaClipBig) { }); EXPECT_EQ(190u, observedData.layerWidth); EXPECT_EQ(200u, observedData.layerHeight); - EXPECT_EQ(Rect(0, 0, 190, 200), observedData.rectClippedBounds) + EXPECT_EQ(Rect(190, 200), observedData.rectClippedBounds) << "expect content to be clipped to screen area"; Matrix4 expected; expected.loadTranslate(0, -2000, 0); @@ -1114,7 +1114,7 @@ TEST(OpReorderer, renderPropSaveLayerAlphaRotate) { // ceil(sqrt(2) / 2 * 200) = 142 EXPECT_EQ(142u, observedData.layerWidth); EXPECT_EQ(142u, observedData.layerHeight); - EXPECT_EQ(Rect(0, 0, 142, 142), observedData.rectClippedBounds); + EXPECT_EQ(Rect(142, 142), observedData.rectClippedBounds); EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), observedData.rectMatrix); } @@ -1128,7 +1128,7 @@ TEST(OpReorderer, renderPropSaveLayerAlphaScale) { }); EXPECT_EQ(100u, observedData.layerWidth); EXPECT_EQ(400u, observedData.layerHeight); - EXPECT_EQ(Rect(0, 0, 100, 400), observedData.rectClippedBounds); + EXPECT_EQ(Rect(100, 400), observedData.rectClippedBounds); EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), observedData.rectMatrix); } diff --git a/libs/hwui/tests/unit/RecordingCanvasTests.cpp b/libs/hwui/tests/unit/RecordingCanvasTests.cpp index ba9d18559d73..08f927ce00fd 100644 --- a/libs/hwui/tests/unit/RecordingCanvasTests.cpp +++ b/libs/hwui/tests/unit/RecordingCanvasTests.cpp @@ -54,7 +54,7 @@ TEST(RecordingCanvas, drawLines) { ASSERT_EQ(RecordedOpId::LinesOp, op->opId); EXPECT_EQ(4, ((LinesOp*)op)->floatCount) << "float count must be rounded down to closest multiple of 4"; - EXPECT_EQ(Rect(0, 0, 20, 10), op->unmappedBounds) + EXPECT_EQ(Rect(20, 10), op->unmappedBounds) << "unmapped bounds must be size of line, and not outset for stroke width"; } @@ -66,7 +66,7 @@ TEST(RecordingCanvas, drawRect) { ASSERT_EQ(1u, dl->getOps().size()) << "Must be exactly one op"; auto op = *(dl->getOps()[0]); ASSERT_EQ(RecordedOpId::RectOp, op.opId); - EXPECT_EQ(Rect(0, 0, 100, 200), op.localClipRect); + EXPECT_EQ(Rect(100, 200), op.localClipRect); EXPECT_EQ(Rect(10, 20, 90, 180), op.unmappedBounds); } @@ -83,7 +83,7 @@ TEST(RecordingCanvas, drawText) { playbackOps(*dl, [&count](const RecordedOp& op) { count++; ASSERT_EQ(RecordedOpId::TextOp, op.opId); - EXPECT_EQ(Rect(0, 0, 200, 200), op.localClipRect); + EXPECT_EQ(Rect(200, 200), op.localClipRect); EXPECT_TRUE(op.localMatrix.isIdentity()); EXPECT_TRUE(op.unmappedBounds.contains(25, 15, 50, 25)) << "Op expected to be 25+ pixels wide, 10+ pixels tall"; @@ -184,8 +184,8 @@ TEST(RecordingCanvas, backgroundAndImage) { ASSERT_EQ(RecordedOpId::RectOp, op.opId); ASSERT_NE(nullptr, op.paint); EXPECT_EQ(SK_ColorBLUE, op.paint->getColor()); - EXPECT_EQ(Rect(0, 0, 100, 200), op.unmappedBounds); - EXPECT_EQ(Rect(0, 0, 100, 200), op.localClipRect); + EXPECT_EQ(Rect(100, 200), op.unmappedBounds); + EXPECT_EQ(Rect(100, 200), op.localClipRect); Matrix4 expectedMatrix; expectedMatrix.loadIdentity(); @@ -193,8 +193,8 @@ TEST(RecordingCanvas, backgroundAndImage) { } else { ASSERT_EQ(RecordedOpId::BitmapOp, op.opId); EXPECT_EQ(nullptr, op.paint); - EXPECT_EQ(Rect(0, 0, 25, 25), op.unmappedBounds); - EXPECT_EQ(Rect(0, 0, 100, 200), op.localClipRect); + EXPECT_EQ(Rect(25, 25), op.unmappedBounds); + EXPECT_EQ(Rect(100, 200), op.localClipRect); Matrix4 expectedMatrix; expectedMatrix.loadTranslate(25, 25, 0); @@ -219,12 +219,12 @@ TEST(RecordingCanvas, saveLayer_simple) { case 0: EXPECT_EQ(RecordedOpId::BeginLayerOp, op.opId); EXPECT_EQ(Rect(10, 20, 190, 180), op.unmappedBounds); - EXPECT_EQ(Rect(0, 0, 200, 200), op.localClipRect); + EXPECT_EQ(Rect(200, 200), op.localClipRect); EXPECT_TRUE(op.localMatrix.isIdentity()); break; case 1: EXPECT_EQ(RecordedOpId::RectOp, op.opId); - EXPECT_EQ(Rect(0, 0, 180, 160), op.localClipRect); + EXPECT_EQ(Rect(180, 160), op.localClipRect); EXPECT_EQ(Rect(10, 20, 190, 180), op.unmappedBounds); expectedMatrix.loadTranslate(-10, -20, 0); EXPECT_MATRIX_APPROX_EQ(expectedMatrix, op.localMatrix); @@ -254,9 +254,9 @@ TEST(RecordingCanvas, saveLayer_viewportCrop) { if (count++ == 1) { Matrix4 expectedMatrix; EXPECT_EQ(RecordedOpId::RectOp, op.opId); - EXPECT_EQ(Rect(0, 0, 100, 100), op.localClipRect) << "Recorded clip rect should be" + EXPECT_EQ(Rect(100, 100), op.localClipRect) << "Recorded clip rect should be" " intersection of viewport and saveLayer bounds, in layer space"; - EXPECT_EQ(Rect(0, 0, 400, 400), op.unmappedBounds); + EXPECT_EQ(Rect(400, 400), op.unmappedBounds); expectedMatrix.loadTranslate(-100, -100, 0); EXPECT_MATRIX_APPROX_EQ(expectedMatrix, op.localMatrix); } @@ -281,8 +281,8 @@ TEST(RecordingCanvas, saveLayer_rotateUnclipped) { playbackOps(*dl, [&count](const RecordedOp& op) { if (count++ == 1) { EXPECT_EQ(RecordedOpId::RectOp, op.opId); - EXPECT_EQ(Rect(0, 0, 100, 100), op.localClipRect); - EXPECT_EQ(Rect(0, 0, 100, 100), op.unmappedBounds); + EXPECT_EQ(Rect(100, 100), op.localClipRect); + EXPECT_EQ(Rect(100, 100), op.unmappedBounds); EXPECT_MATRIX_APPROX_EQ(Matrix4::identity(), op.localMatrix) << "Recorded op shouldn't see any canvas transform before the saveLayer"; } @@ -313,7 +313,7 @@ TEST(RecordingCanvas, saveLayer_rotateClipped) { // ...and get about 58.6, 58.6, 341.4 341.4, because the bounds are clipped by // the parent 200x200 viewport, but prior to rotation EXPECT_RECT_APPROX_EQ(Rect(58.57864, 58.57864, 341.42136, 341.42136), op.localClipRect); - EXPECT_EQ(Rect(0, 0, 400, 400), op.unmappedBounds); + EXPECT_EQ(Rect(400, 400), op.unmappedBounds); expectedMatrix.loadIdentity(); EXPECT_MATRIX_APPROX_EQ(expectedMatrix, op.localMatrix); } |