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

removed forbidden skia include #38761

Merged
merged 2 commits into from
Jan 11, 2023
Merged

removed forbidden skia include #38761

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8c3003
removed forbidden skia include
gaaclarke Jan 11, 2023
3c1a896
jason feedback
gaaclarke Jan 11, 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
6 changes: 3 additions & 3 deletions shell/platform/embedder/tests/embedder_gl_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include "flutter/testing/assertions_skia.h"
#include "flutter/testing/test_gl_surface.h"
#include "flutter/testing/testing.h"
#include "impeller/renderer/backend/gles/gles.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be included directly from a GLES header instead of going through an Impeller internal header?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep done. I thought there would be magic for opengl es vs opengl. This works too.

#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/src/gpu/gl/GrGLDefines.h"
#include "third_party/tonic/converter/dart_converter.h"

// CREATE_NATIVE_ENTRY is leaky by design
Expand Down Expand Up @@ -4033,9 +4033,9 @@ TEST_F(EmbedderTest, ExternalTextureGLRefreshedTooOften) {
[&](int64_t, size_t, size_t) {
resolve_called = true;
auto res = std::make_unique<FlutterOpenGLTexture>();
res->target = GR_GL_TEXTURE_2D;
res->target = GL_TEXTURE_2D;
res->name = name;
res->format = GR_GL_RGBA8;
res->format = GL_RGBA8;
res->user_data = nullptr;
res->destruction_callback = [](void*) {};
res->width = res->height = 100;
Expand Down