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

Ensure Vulkan when including Skia Vulkan headers #55126

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Ensure Vulkan when including Skia Vulkan headers #55126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion shell/platform/embedder/embedder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "third_party/skia/include/gpu/GpuTypes.h"
#include "third_party/skia/include/gpu/ganesh/GrBackendSurface.h"
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkTypes.h"

#if !defined(FLUTTER_NO_EXPORT)
#if FML_OS_WIN
Expand Down Expand Up @@ -101,6 +100,7 @@ extern const intptr_t kPlatformStrongDillSize;

#ifdef SHELL_ENABLE_VULKAN
#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkTypes.h"
#endif // SHELL_ENABLE_VULKAN

const int32_t kFlutterSemanticsNodeIdBatchEnd = -1;
Expand Down
6 changes: 3 additions & 3 deletions shell/platform/embedder/tests/embedder_test_backingstore_producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@
#include "third_party/skia/include/gpu/GpuTypes.h"
#include "third_party/skia/include/gpu/ganesh/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/GrGLTypes.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkTypes.h"

#include <cstdlib>
#include <memory>
#include <utility>

#ifdef SHELL_ENABLE_VULKAN
#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSurface.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkTypes.h"
#endif // SHELL_ENABLE_VULKAN

#ifdef SHELL_ENABLE_METAL
Expand All @@ -33,6 +31,8 @@

#ifdef SHELL_ENABLE_GL
#include "flutter/testing/test_gl_surface.h"
#include "third_party/skia/include/gpu/ganesh/gl/GrGLBackendSurface.h"
#include "third_party/skia/include/gpu/ganesh/gl/GrGLTypes.h"
#endif // SHELL_ENABLE_GL

// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
Expand Down