From 4bd68431ca556c68d455446e31a6c7a3cedc0557 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Mon, 14 Aug 2023 14:29:04 +0000 Subject: [PATCH] Migrate more GL calls of GrBackend* --- lib/web_ui/skwasm/image.cpp | 5 +++-- lib/web_ui/skwasm/surface.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/web_ui/skwasm/image.cpp b/lib/web_ui/skwasm/image.cpp index 8216f4132090a..291d4cd21e3f5 100644 --- a/lib/web_ui/skwasm/image.cpp +++ b/lib/web_ui/skwasm/image.cpp @@ -17,6 +17,7 @@ #include "third_party/skia/include/gpu/ganesh/GrExternalTextureGenerator.h" #include "third_party/skia/include/gpu/ganesh/SkImageGanesh.h" #include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h" +#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h" #include "third_party/skia/include/gpu/gl/GrGLInterface.h" #include "third_party/skia/include/gpu/gl/GrGLTypes.h" @@ -100,8 +101,8 @@ class VideoFrameImageGenerator : public GrExternalTextureGenerator { glInfo.fFormat = GL_RGBA8_OES; glInfo.fTarget = GL_TEXTURE_2D; - GrBackendTexture backendTexture(fInfo.width(), fInfo.height(), mipmapped, - glInfo); + auto backendTexture = GrBackendTextures::MakeGL( + fInfo.width(), fInfo.height(), mipmapped, glInfo); return std::make_unique( backendTexture, glInfo.fID, emscripten_webgl_get_current_context()); } diff --git a/lib/web_ui/skwasm/surface.cpp b/lib/web_ui/skwasm/surface.cpp index 834131f8bce69..f07257b92658d 100644 --- a/lib/web_ui/skwasm/surface.cpp +++ b/lib/web_ui/skwasm/surface.cpp @@ -6,6 +6,7 @@ #include "third_party/skia/include/gpu/GrBackendSurface.h" #include "third_party/skia/include/gpu/GrDirectContext.h" +#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h" using namespace Skwasm; @@ -155,8 +156,8 @@ void Surface::_setCanvasSize(int width, int height) { // Worker thread only void Surface::_recreateSurface() { makeCurrent(_glContext); - GrBackendRenderTarget target(_canvasWidth, _canvasHeight, _sampleCount, - _stencil, _fbInfo); + auto target = GrBackendRenderTargets::MakeGL(_canvasWidth, _canvasHeight, + _sampleCount, _stencil, _fbInfo); _surface = SkSurfaces::WrapBackendRenderTarget( _grContext.get(), target, kBottomLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType, SkColorSpace::MakeSRGB(), nullptr);