From b8c300373377806e5328a7f70024421aa06e9392 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 10 Jan 2023 17:06:49 -0800 Subject: [PATCH 1/2] removed forbidden skia include --- shell/platform/embedder/tests/embedder_gl_unittests.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/platform/embedder/tests/embedder_gl_unittests.cc b/shell/platform/embedder/tests/embedder_gl_unittests.cc index a7018859d1d47..56f6561f3f419 100644 --- a/shell/platform/embedder/tests/embedder_gl_unittests.cc +++ b/shell/platform/embedder/tests/embedder_gl_unittests.cc @@ -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" #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 @@ -4033,9 +4033,9 @@ TEST_F(EmbedderTest, ExternalTextureGLRefreshedTooOften) { [&](int64_t, size_t, size_t) { resolve_called = true; auto res = std::make_unique(); - 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; From 3c1a896af2cabc7c190ad9dc012e9676052e3a99 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 10 Jan 2023 18:22:19 -0800 Subject: [PATCH 2/2] jason feedback --- shell/platform/embedder/tests/embedder_gl_unittests.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/embedder/tests/embedder_gl_unittests.cc b/shell/platform/embedder/tests/embedder_gl_unittests.cc index 56f6561f3f419..97426587e7a90 100644 --- a/shell/platform/embedder/tests/embedder_gl_unittests.cc +++ b/shell/platform/embedder/tests/embedder_gl_unittests.cc @@ -11,6 +11,7 @@ #include "vulkan/vulkan.h" +#include "GLES3/gl3.h" #include "flutter/flow/raster_cache.h" #include "flutter/fml/file.h" #include "flutter/fml/make_copyable.h" @@ -33,7 +34,6 @@ #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" #include "third_party/skia/include/core/SkSurface.h" #include "third_party/tonic/converter/dart_converter.h"