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

Commit 8099b671 authored by Kevin Lubick's avatar Kevin Lubick
Browse files

[base] SkBudgeted -> skgpu::Budgeted 

Follow-up from https://skia-review.googlesource.com/c/skia/+/621977

Change-Id: I2a381a325c5c0c50f0d27e9d06210bb6be878919
Bug: skbug.com/13983
parent 123d9f63

libs/hwui/Readback.cpp

+9 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <SkRefCnt.h>

#include <SkSamplingOptions.h>

#include <SkSurface.h>

#include "include/gpu/GpuTypes.h" // from Skia

#include <gui/TraceUtils.h>

#include <private/android/AHardwareBufferHelpers.h>

#include <shaders/shaders.h>
@@ -170,14 +171,15 @@ void Readback::copySurfaceInto(ANativeWindow* window, const std::shared_ptr<Copy 
    SkBitmap skBitmap = request->getDestinationBitmap(srcRect.width(), srcRect.height());

    SkBitmap* bitmap = &skBitmap;

    sk_sp<SkSurface> tmpSurface =

            SkSurface::MakeRenderTarget(mRenderThread.getGrContext(), SkBudgeted::kYes,

            SkSurface::MakeRenderTarget(mRenderThread.getGrContext(), skgpu::Budgeted::kYes,

                                        bitmap->info(), 0, kTopLeft_GrSurfaceOrigin, nullptr);



    // if we can't generate a GPU surface that matches the destination bitmap (e.g. 565) then we

    // attempt to do the intermediate rendering step in 8888

    if (!tmpSurface.get()) {

        SkImageInfo tmpInfo = bitmap->info().makeColorType(SkColorType::kN32_SkColorType);

        tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(), SkBudgeted::kYes,

        tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(),

                                                 skgpu::Budgeted::kYes,

                                                 tmpInfo, 0, kTopLeft_GrSurfaceOrigin, nullptr);

        if (!tmpSurface.get()) {

            ALOGW("Unable to generate GPU buffer in a format compatible with the provided bitmap");
@@ -345,14 +347,17 @@ bool Readback::copyLayerInto(Layer* layer, const SkRect* srcRect, const SkRect* 
     * software buffer.

     */

    sk_sp<SkSurface> tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(),

                                                              SkBudgeted::kYes, bitmap->info(), 0,

                                                              skgpu::Budgeted::kYes,

                                                              bitmap->info(),

                                                              0,

                                                              kTopLeft_GrSurfaceOrigin, nullptr);



    // if we can't generate a GPU surface that matches the destination bitmap (e.g. 565) then we

    // attempt to do the intermediate rendering step in 8888

    if (!tmpSurface.get()) {

        SkImageInfo tmpInfo = bitmap->info().makeColorType(SkColorType::kN32_SkColorType);

        tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(), SkBudgeted::kYes,

        tmpSurface = SkSurface::MakeRenderTarget(mRenderThread.getGrContext(),

                                                 skgpu::Budgeted::kYes,

                                                 tmpInfo, 0, kTopLeft_GrSurfaceOrigin, nullptr);

        if (!tmpSurface.get()) {

            ALOGW("Unable to generate GPU buffer in a format compatible with the provided bitmap");

libs/hwui/RecordingCanvas.cpp

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "SkTextBlob.h"

#include "SkVertices.h"

#include "VectorDrawable.h"

#include "include/gpu/GpuTypes.h" // from Skia

#include "pipeline/skia/AnimatedDrawables.h"

#include "pipeline/skia/FunctorDrawable.h"
@@ -570,7 +571,7 @@ public: 
                GrRecordingContext* directContext = c->recordingContext();

                mLayerImageInfo =

                        c->imageInfo().makeWH(deviceBounds.width(), deviceBounds.height());

                mLayerSurface = SkSurface::MakeRenderTarget(directContext, SkBudgeted::kYes,

                mLayerSurface = SkSurface::MakeRenderTarget(directContext, skgpu::Budgeted::kYes,

                                                            mLayerImageInfo, 0,

                                                            kTopLeft_GrSurfaceOrigin, nullptr);

            }

libs/hwui/pipeline/skia/GLFunctorDrawable.cpp

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "SkClipStack.h"

#include "SkRect.h"

#include "SkM44.h"

#include "include/gpu/GpuTypes.h" // from Skia

#include "utils/GLUtils.h"



namespace android {
@@ -92,7 +93,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) { 
        SkImageInfo surfaceInfo =

                canvas->imageInfo().makeWH(clipBounds.width(), clipBounds.height());

        tmpSurface =

                SkSurface::MakeRenderTarget(directContext, SkBudgeted::kYes, surfaceInfo);

                SkSurface::MakeRenderTarget(directContext, skgpu::Budgeted::kYes, surfaceInfo);

        tmpSurface->getCanvas()->clear(SK_ColorTRANSPARENT);



        GrGLFramebufferInfo fboInfo;

libs/hwui/pipeline/skia/SkiaPipeline.cpp

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <SkStream.h>

#include <SkString.h>

#include <SkTypeface.h>

#include "include/gpu/GpuTypes.h" // from Skia

#include <android-base/properties.h>

#include <unistd.h>
@@ -187,7 +188,7 @@ bool SkiaPipeline::createOrUpdateLayer(RenderNode* node, const DamageAccumulator 
        SkSurfaceProps props(0, kUnknown_SkPixelGeometry);

        SkASSERT(mRenderThread.getGrContext() != nullptr);

        node->setLayerSurface(SkSurface::MakeRenderTarget(mRenderThread.getGrContext(),

                                                          SkBudgeted::kYes, info, 0,

                                                          skgpu::Budgeted::kYes, info, 0,

                                                          this->getSurfaceOrigin(), &props));

        if (node->getLayerSurface()) {

            // update the transform in window of the layer to reset its origin wrt light source

libs/hwui/pipeline/skia/StretchMask.cpp

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include "SkBlendMode.h"

#include "SkCanvas.h"

#include "SkSurface.h"

#include "include/gpu/GpuTypes.h" // from Skia



#include "TransformCanvas.h"

#include "SkiaDisplayList.h"
@@ -36,7 +38,7 @@ void StretchMask::draw(GrRecordingContext* context, 
        // not match.

        mMaskSurface = SkSurface::MakeRenderTarget(

            context,

            SkBudgeted::kYes,

            skgpu::Budgeted::kYes,

            SkImageInfo::Make(

                width,

                height,