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

Commit 6949746b authored by Kevin Lubick's avatar Kevin Lubick
Browse files

Use SkCanvasAndroid functions instead of deprecated canvasMethods 

See https://skia-review.googlesource.com/c/skia/+/709957 for
the moved functions.

I also replace an SkASSERT (a private macro) with an proper
Android assert.

Change-Id: If03aba5e11b7c248a694d089ad38329bb5ecffdc
parent 09ab9fb8

libs/hwui/pipeline/skia/GLFunctorDrawable.cpp

+5 −3
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include "GrBackendSurface.h"

#include "RenderNode.h"

#include "SkAndroidFrameworkUtils.h"

#include "SkCanvas.h"

#include "SkCanvasAndroid.h"

#include "SkClipStack.h"

#include "SkRect.h"

#include "SkM44.h"
@@ -35,7 +37,7 @@ namespace uirenderer { 
namespace skiapipeline {



static void setScissor(int viewportHeight, const SkIRect& clip) {

    SkASSERT(!clip.isEmpty());

    LOG_FATAL_IF(clip.isEmpty(), "empty scissor clip");

    // transform to Y-flipped GL space, and prevent negatives

    GLint y = viewportHeight - clip.fBottom;

    GLint height = (viewportHeight - clip.fTop) - y;
@@ -43,7 +45,7 @@ static void setScissor(int viewportHeight, const SkIRect& clip) { 
}



static void GetFboDetails(SkCanvas* canvas, GLuint* outFboID, SkISize* outFboSize) {

    GrBackendRenderTarget renderTarget = canvas->topLayerBackendRenderTarget();

    GrBackendRenderTarget renderTarget = skgpu::ganesh::TopLayerBackendRenderTarget(canvas);

    GrGLFramebufferInfo fboInfo;

    LOG_ALWAYS_FATAL_IF(!renderTarget.getGLFramebufferInfo(&fboInfo),

        "getGLFrameBufferInfo failed");
@@ -83,7 +85,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 
    SkISize fboSize;

    GetFboDetails(canvas, &fboID, &fboSize);



    SkIRect surfaceBounds = canvas->topLayerBounds();

    SkIRect surfaceBounds = skgpu::ganesh::TopLayerBounds(canvas);

    SkIRect clipBounds = canvas->getDeviceClipBounds();

    SkM44 mat4(canvas->getLocalToDevice());

    SkRegion clipRegion;