Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions shell/common/shell_io_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
#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"
#include "third_party/skia/include/gpu/gl/GrGLTypes.h"

namespace flutter {

sk_sp<GrDirectContext> ShellIOManager::CreateCompatibleResourceLoadingContext(
GrBackend backend,
GrBackendApi backend,
const sk_sp<const GrGLInterface>& gl_interface) {
#if SK_GL
if (backend != GrBackend::kOpenGL_GrBackend) {
if (backend != GrBackendApi::kOpenGL) {
return nullptr;
}

Expand Down
5 changes: 4 additions & 1 deletion shell/common/shell_io_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
#include "flutter/fml/memory/weak_ptr.h"
#include "flutter/lib/ui/io_manager.h"
#include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/include/gpu/GrTypes.h"

struct GrGLInterface;

namespace flutter {

Expand All @@ -21,7 +24,7 @@ class ShellIOManager final : public IOManager {
// supply to the IOManager. The platforms may create the context themselves if
// they so desire.
static sk_sp<GrDirectContext> CreateCompatibleResourceLoadingContext(
GrBackend backend,
GrBackendApi backend,
const sk_sp<const GrGLInterface>& gl_interface);

ShellIOManager(
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/android/platform_view_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ sk_sp<GrDirectContext> PlatformViewAndroid::CreateResourceContext() const {
// the OpenGL surface will be able to make a resource context current. If
// this changes, this assumption breaks. Handle the same.
resource_context = ShellIOManager::CreateCompatibleResourceLoadingContext(
GrBackend::kOpenGL_GrBackend,
GrBackendApi::kOpenGL,
GPUSurfaceGLDelegate::GetDefaultPlatformGLInterface());
} else {
FML_DLOG(ERROR) << "Could not make the resource context current.";
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/embedder/embedder_surface_gl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sk_sp<GrDirectContext> EmbedderSurfaceGL::CreateResourceContext() const {
auto callback = gl_dispatch_table_.gl_make_resource_current_callback;
if (callback && callback()) {
if (auto context = ShellIOManager::CreateCompatibleResourceLoadingContext(
GrBackend::kOpenGL_GrBackend, GetGLInterface())) {
GrBackendApi::kOpenGL, GetGLInterface())) {
return context;
} else {
FML_LOG(ERROR)
Expand Down