Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5430ab22 authored by Chris Craik's avatar Chris Craik
Browse files

Avoid unneeded rect params 

Change-Id: I2d8dcf6b09fdc554a403ac74763bf856b5f5d9fa
parent c7964751

libs/hwui/BakedOpDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

libs/hwui/FontRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

libs/hwui/GlopBuilder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

libs/hwui/OpenGLRenderer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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

libs/hwui/RecordedOp.h

+1 −1
Original line number Diff line number Diff line
@@ -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) {}

};



/**