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

Commit 2c00da4e authored by Kevin Lubick's avatar Kevin Lubick Committed by Android (Google) Code Review
Browse files

Merge "[base] Migrate deprecated GL GrBackendRenderTarget constructor" into main

parents 34c4ac38 2757694f

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "SkiaOpenGLPipeline.h"

#include "SkiaOpenGLPipeline.h"





#include <include/gpu/ganesh/SkSurfaceGanesh.h>

#include <include/gpu/ganesh/SkSurfaceGanesh.h>

#include <include/gpu/ganesh/gl/GrGLBackendSurface.h>

#include <include/gpu/gl/GrGLTypes.h>

#include <include/gpu/gl/GrGLTypes.h>

#include <GrBackendSurface.h>

#include <GrBackendSurface.h>

#include <SkBlendMode.h>

#include <SkBlendMode.h>
@@ -140,7 +141,8 @@ IRenderPipeline::DrawResult SkiaOpenGLPipeline::draw( 
        LOG_ALWAYS_FATAL("Unsupported color type.");

        LOG_ALWAYS_FATAL("Unsupported color type.");

    }

    }





    GrBackendRenderTarget backendRT(frame.width(), frame.height(), 0, STENCIL_BUFFER_SIZE, fboInfo);

    auto backendRT = GrBackendRenderTargets::MakeGL(frame.width(), frame.height(), 0,

                                                    STENCIL_BUFFER_SIZE, fboInfo);





    SkSurfaceProps props(mColorMode == ColorMode::Default ? 0 : SkSurfaceProps::kAlwaysDither_Flag,

    SkSurfaceProps props(mColorMode == ColorMode::Default ? 0 : SkSurfaceProps::kAlwaysDither_Flag,

                         kUnknown_SkPixelGeometry);

                         kUnknown_SkPixelGeometry);