From 0f15c5dc9783a2b5a9c14779a784bf3f40e88152 Mon Sep 17 00:00:00 2001
From: Ben Wagner <bungeman@chromium.org>
Date: Thu, 12 Sep 2024 11:25:38 -0400
Subject: [PATCH] Update Skia build for Vulkan headers

Skia has its own set of Vulkan headers which Skia Vulkan sources expect
to be compiled against. This internal set of Vulkan headers should not
be seen by any users. Instead, users provide their own set of Vulkan
headers and Skia's public Vk headers will use the user's Vulkan headers
when included in user sources. Unfortunately, this has not been well
enforced and Skia is making changes to ensure that Skia's set of Vulkan
headers does not leak. This change updates Flutter's build of Skia to be
compatible with these Skia changes.

Skia-Change: https://skia-review.googlesource.com/c/skia/+/898139
---
 skia/BUILD.gn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 68825ba104aa2..2b3f81f3859c4 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -99,6 +99,11 @@ skia_library_configs = [
   ":skia_library",
 ]
 
+config("our_vulkan_headers") {
+  include_dirs = [ "include/third_party/vulkan" ]
+  defines = [ "SK_USE_INTERNAL_VULKAN_HEADERS" ]
+}
+
 # Use for CPU-specific Skia code that needs particular compiler flags.
 template("opts") {
   if (invoker.enabled) {
@@ -351,6 +356,7 @@ optional("fontmgr_win") {
 optional("gpu_shared") {
   enabled = skia_enable_ganesh
 
+  configs = []
   deps = []
   libs = []
   public_defines = []
@@ -364,6 +370,7 @@ optional("gpu_shared") {
   if (skia_use_vulkan) {
     public_defines += [ "SK_VULKAN" ]
     sources += skia_shared_vk_sources
+    configs += [ ":our_vulkan_headers" ]
     if (skia_enable_vulkan_debug_layers) {
       public_defines += [ "SK_ENABLE_VK_LAYERS" ]
     }
@@ -380,6 +387,8 @@ optional("gpu_shared") {
 
 optional("gpu") {
   enabled = skia_enable_ganesh
+
+  configs = []
   deps = [ ":gpu_shared" ]
   public_defines = []
   public_configs = []
@@ -445,6 +454,7 @@ optional("gpu") {
   if (skia_use_vulkan) {
     public += skia_gpu_vk_public
     sources += skia_gpu_vk_private
+    configs += [ ":our_vulkan_headers" ]
     if (is_fuchsia) {
       public_deps += [ "${fuchsia_sdk}/pkg/vulkan" ]
     }