Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Update to use GrDirectContexts::MakeGL #46308

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Update to use GrDirectContexts::MakeGL #46308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a7f4e3
Update to use GrDirectContexts::MakeGL
kjlubick Sep 26, 2023
2ed64e2
Merge branch 'main' into grgldirectcontext
kjlubick Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/web_ui/skwasm/surface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,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"
#include "third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h"

using namespace Skwasm;

Expand Down Expand Up @@ -91,7 +92,7 @@ void Surface::_init() {
makeCurrent(_glContext);
emscripten_webgl_enable_extension(_glContext, "WEBGL_debug_renderer_info");

_grContext = GrDirectContext::MakeGL(GrGLMakeNativeInterface());
_grContext = GrDirectContexts::MakeGL(GrGLMakeNativeInterface());

// WebGL should already be clearing the color and stencil buffers, but do it
// again here to ensure Skia receives them in the expected state.
Expand Down
3 changes: 2 additions & 1 deletion shell/common/shell_io_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "flutter/fml/message_loop.h"
#include "flutter/shell/common/context_options.h"
#include "third_party/skia/include/gpu/ganesh/gl/GrGLDirectContext.h"
#include "third_party/skia/include/gpu/gl/GrGLInterface.h"

namespace flutter {
Expand All @@ -22,7 +23,7 @@ sk_sp<GrDirectContext> ShellIOManager::CreateCompatibleResourceLoadingContext(

const auto options = MakeDefaultContextOptions(ContextType::kResource);

if (auto context = GrDirectContext::MakeGL(gl_interface, options)) {
if (auto context = GrDirectContexts::MakeGL(gl_interface, options)) {
// Do not cache textures created by the image decoder. These textures
// should be deleted when they are no longer referenced by an SkImage.
context->setResourceCacheLimit(0);
Expand Down
3 changes: 2 additions & 1 deletion shell/gpu/gpu_surface_gl_skia.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "third_party/skia/include/gpu/GrContextOptions.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/ganesh/gl/GrGLDirectContext.h"
#include "third_party/skia/include/gpu/gl/GrGLTypes.h"

// These are common defines present on all OpenGL headers. However, we don't
Expand Down Expand Up @@ -51,7 +52,7 @@ sk_sp<GrDirectContext> GPUSurfaceGLSkia::MakeGLContext(
const auto options =
MakeDefaultContextOptions(ContextType::kRender, GrBackendApi::kOpenGL);

auto context = GrDirectContext::MakeGL(delegate->GetGLInterface(), options);
auto context = GrDirectContexts::MakeGL(delegate->GetGLInterface(), options);

if (!context) {
FML_LOG(ERROR) << "Failed to set up Skia Gr context.";
Expand Down
3 changes: 2 additions & 1 deletion testing/test_gl_surface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "third_party/skia/include/gpu/GrBackendSurface.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/ganesh/gl/GrGLDirectContext.h"
#include "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h"
#include "third_party/skia/include/gpu/gl/GrGLTypes.h"

Expand Down Expand Up @@ -336,7 +337,7 @@ sk_sp<GrDirectContext> TestGLSurface::CreateGrContext() {
return nullptr;
}

context_ = GrDirectContext::MakeGL(interface);
context_ = GrDirectContexts::MakeGL(interface);
return context_;
}

Expand Down