Use implementation_deps to hide vulkan headers

Skia has its own set of vulkan headers which it compiles against
internally, but the user may specify a different set of vulkan headers
when compiling against Skia. Ensure that the internal vulkan headers do
not leak by using implementation_deps.

Pre-Fix: https://chromium-review.googlesource.com/c/chromium/src/+/5854646
Pre-Fix: https://chromium-review.googlesource.com/c/chromium/src/+/5854994
Pre-Fix: flutter/engine#55126
Pre-Fix: flutter/engine#55143
Change-Id: Ic11c0920c20e4aeb537c607ec5879a93144276a5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/898139
Reviewed-by: Kaylee Lubick <[email protected]>
Commit-Queue: Ben Wagner <[email protected]>

Author: Ben Wagner

BUILD.gn

@@ -855,6 +855,7 @@ group("compile_all_sksl_tests") {
 optional("gpu_shared") {
   enabled = skia_enable_ganesh || skia_enable_graphite
 
+  configs = []
   deps = []
   libs = []
   public_defines = []
@@ -901,6 +902,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" ]
     }
@@ -930,6 +932,7 @@ optional("gpu") {
   if (skia_generate_workarounds) {
     deps += [ ":workaround_list" ]
   }
+  configs = []
   public_defines = []
   public_configs = []
   public_deps = []
@@ -1003,6 +1006,7 @@ optional("gpu") {
   if (skia_use_vulkan) {
     public += skia_gpu_vk_public
     sources += skia_gpu_vk_private
+    configs += [ ":our_vulkan_headers" ]
     if (is_fuchsia) {
       if (using_fuchsia_sdk) {
         public_deps += [ "$fuchsia_sdk_root/pkg:vulkan" ]
@@ -1147,6 +1151,7 @@ optional("ndk_images") {
 }
 
 optional("graphite") {
+  configs = []
   libs = []
   frameworks = []
   public_defines = []
@@ -1188,6 +1193,7 @@ optional("graphite") {
   if (skia_use_vulkan) {
     public += skia_graphite_vk_public
     sources += skia_graphite_vk_sources
+    configs += [ ":our_vulkan_headers" ]
   }
   if (skia_enable_precompile) {
     public += skia_graphite_precompile_public
@@ -1707,6 +1713,7 @@ group("modules") {
 
 config("our_vulkan_headers") {
   include_dirs = [ "include/third_party/vulkan" ]
+  defines = [ "SK_USE_INTERNAL_VULKAN_HEADERS" ]
 }
 
 config("vulkan_memory_allocator") {

bazel/external/vulkan_headers/BUILD.bazel

@@ -19,7 +19,9 @@ cc_library(
     hdrs = [
         "include/vulkan/vk_platform.h",
         "include/vulkan/vulkan.h",
+        "include/vulkan/vulkan_android.h",
         "include/vulkan/vulkan_core.h",
+        "include/vulkan/vulkan_xcb.h",
     ],
     includes = ["include"],
     visibility = ["//visibility:public"],

example/external_client/BUILD.bazel

@@ -237,6 +237,7 @@ cc_binary(
     deps = [
         "@skia//:core",
         "@skia//:graphite_native_vulkan",
+        "@vulkan_headers",
     ],
 )
 

include/private/gpu/vk/SkiaVulkan.h

@@ -12,7 +12,7 @@
 
 // IWYU pragma: begin_exports
 
-#if (SKIA_IMPLEMENTATION || !defined(SK_VULKAN)) && !defined(SK_USE_EXTERNAL_VULKAN_HEADERS)
+#if defined(SK_USE_INTERNAL_VULKAN_HEADERS) && !defined(SK_BUILD_FOR_GOOGLE3)
 #include "include/third_party/vulkan/vulkan/vulkan_core.h"
 #else
 // For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan
@@ -22,7 +22,7 @@
 
 #ifdef SK_BUILD_FOR_ANDROID
 // This is needed to get android extensions for external memory
-#if (SKIA_IMPLEMENTATION || !defined(SK_VULKAN)) && !defined(SK_USE_EXTERNAL_VULKAN_HEADERS)
+#if defined(SK_USE_INTERNAL_VULKAN_HEADERS) && !defined(SK_BUILD_FOR_GOOGLE3)
 #include "include/third_party/vulkan/vulkan/vulkan_android.h"
 #else
 // For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan

src/gpu/ganesh/vk/BUILD.bazel

@@ -145,7 +145,6 @@ skia_cc_library(
     features = ["layering_check"],
     local_defines = [
         "GPU_TEST_UTILS",
-        "SK_USE_EXTERNAL_VULKAN_HEADERS",
     ],
     visibility = ["//tools:__subpackages__"],
     deps = [

src/gpu/graphite/vk/BUILD.bazel

@@ -63,6 +63,10 @@ skia_cc_library(
         "//include/gpu/graphite/vk:public_hdrs",
     ],
     defines = ["SK_VULKAN"],
+    implementation_deps = [
+        "//include/third_party/vulkan",
+    ],
+    local_defines = ["SK_USE_INTERNAL_VULKAN_HEADERS"],
     visibility = ["//:__pkg__"],
     deps = [
         "//:core",
@@ -90,6 +94,10 @@ skia_cc_library(
         "SK_VULKAN",
         "GPU_TEST_UTILS",
     ],
+    implementation_deps = [
+        "//include/third_party/vulkan",
+    ],
+    local_defines = ["SK_USE_INTERNAL_VULKAN_HEADERS"],
     visibility = ["//tools:__pkg__"],
     deps = [
         "//:core",

src/gpu/vk/BUILD.bazel

@@ -40,18 +40,18 @@ skia_cc_library(
         ":_vk_hdrs",
         "//include/gpu/vk:shared_public_hdrs",
     ],
-    defines = [
-        "SK_USE_EXTERNAL_VULKAN_HEADERS",
-    ],
     features = ["layering_check"],
+    implementation_deps = [
+        "//include/third_party/vulkan",
+    ],
+    local_defines = ["SK_USE_INTERNAL_VULKAN_HEADERS"],
     visibility = [
         "//src/gpu/ganesh/vk:__pkg__",
         "//src/gpu/graphite/vk:__pkg__",
         "//src/gpu/vk/vulkanmemoryallocator:__pkg__",
     ],
     deps = [
         "//:core",
-        "//include/third_party/vulkan",
         "//src/base",
         "//src/gpu",
         "//src/sksl/codegen:spirv",

src/gpu/vk/vulkanmemoryallocator/BUILD.bazel

@@ -35,6 +35,10 @@ skia_cc_library(
         # https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/issues/299
         "-Wno-implicit-fallthrough",
     ],
+    implementation_deps = [
+        "//include/third_party/vulkan",
+    ],
+    local_defines = ["SK_USE_INTERNAL_VULKAN_HEADERS"],
     textual_hdrs = [
         "VulkanMemoryAllocatorWrapper.h",
     ],
@@ -46,7 +50,6 @@ skia_cc_library(
     ],
     deps = [
         "//:core",
-        "//include/third_party/vulkan",
         "//src/base",
         "//src/gpu/vk",
         "@vulkanmemoryallocator//:hdrs",

src/gpu/vk/vulkanmemoryallocator/BUILD.gn

@@ -19,9 +19,10 @@ source_set("vulkanmemoryallocator") {
     "../../../../include/third_party/vulkan",
     "../../../../",
   ]
+  defines = [ "SK_USE_INTERNAL_VULKAN_HEADERS" ]
 
   if (skia_disable_vma_stl_shared_mutex) {
-    defines = [ "VMA_USE_STL_SHARED_MUTEX=0" ]
+    defines += [ "VMA_USE_STL_SHARED_MUTEX=0" ]
   }
 
   sources = [