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

Commit 7a42b4d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "opt into public SkM44"

parents 6be0f18d 56cb2d26

libs/hwui/RecordingCanvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ struct Concat44 final : Op { 
    static const auto kType = Type::Concat44;

    Concat44(const SkScalar m[16]) { memcpy(colMajor, m, sizeof(colMajor)); }

    SkScalar colMajor[16];

    void draw(SkCanvas* c, const SkMatrix&) const { c->experimental_concat44(colMajor); }

    void draw(SkCanvas* c, const SkMatrix&) const { c->concat44(colMajor); }

};

struct Concat final : Op {

    static const auto kType = Type::Concat;

libs/hwui/pipeline/skia/GLFunctorDrawable.cpp

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "SkAndroidFrameworkUtils.h"

#include "SkClipStack.h"

#include "SkRect.h"

#include "include/private/SkM44.h"

#include "SkM44.h"



namespace android {

namespace uirenderer {
@@ -93,7 +93,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 


    SkIRect surfaceBounds = canvas->internal_private_getTopLayerBounds();

    SkIRect clipBounds = canvas->getDeviceClipBounds();

    SkM44 mat4(canvas->experimental_getLocalToDevice());

    SkM44 mat4(canvas->getLocalToDevice());

    SkRegion clipRegion;

    canvas->temporary_internal_getRgnClip(&clipRegion);

libs/hwui/pipeline/skia/VkFunctorDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <GrBackendDrawableInfo.h>

#include <SkAndroidFrameworkUtils.h>

#include <SkImage.h>

#include "include/private/SkM44.h"

#include <SkM44.h>

#include <utils/Color.h>

#include <utils/Trace.h>

#include <utils/TraceUtils.h>

libs/hwui/pipeline/skia/VkInteropFunctorDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void VkInteropFunctorDrawable::onDraw(SkCanvas* canvas) { 
        glBindTexture(GL_TEXTURE_2D, 0);



        DrawGlInfo info;

        SkM44 mat4(canvas->experimental_getLocalToDevice());

        SkM44 mat4(canvas->getLocalToDevice());

        SkIRect clipBounds = canvas->getDeviceClipBounds();



        info.clipLeft = clipBounds.fLeft;