[vulkan] Update layers for compatibility with upstream

Disable GN include checks temporarily. After the VVL repo has been
updated the include checks will be restored.

Bug:b/319117470

Change-Id: I6a42a0d3c40260b846f62a8f1cf24e2a004768f1
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/970937
Fuchsia-Auto-Submit: Craig Stout <cstout@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: John Bauman <jbauman@google.com>

Author: cdotstout

src/lib/vulkan/layers.gni

@@ -7,4 +7,4 @@
 # this will add both the loadable module, configuration JSON file and related
 # dependencies.
 
-import("//third_party/Vulkan-ValidationLayers/build-gn/layers-fuchsia.gni")
+import("//third_party/Vulkan-ValidationLayers/scripts/gn/layers-fuchsia.gni")

src/lib/vulkan/swapchain/BUILD.gn

@@ -23,27 +23,34 @@ validation_layer_dir = "//third_party/Vulkan-ValidationLayers"
 config("vulkan_layer_config") {
   include_dirs = [
     "$validation_layer_dir/layers",
-    "$validation_layer_dir/layers/generated",
+    "$validation_layer_dir/layers/utils",
+    "$validation_layer_dir/layers/vulkan",
+    "$validation_layer_dir/layers/vulkan/generated",
   ]
   cflags = [ "-Wno-extra-semi" ]
 }
 
 source_set("layer_common") {
+  #TODO(b/319117470) - remove to complete soft transition
+  check_includes = false
   public_configs = [ ":vulkan_layer_config" ]
 
   sources = [
-    "$validation_layer_dir/layers/generated/vk_dispatch_table_helper.h",
-    "$validation_layer_dir/layers/generated/vk_extension_helper.h",
-    "$validation_layer_dir/layers/generated/vk_layer_dispatch_table.h",
-    "$validation_layer_dir/layers/vk_layer_data.h",
-    "$validation_layer_dir/layers/vk_layer_extension_utils.cpp",
-    "$validation_layer_dir/layers/vk_layer_extension_utils.h",
+    "$validation_layer_dir/layers/containers/custom_containers.h",
+    "$validation_layer_dir/layers/utils/vk_layer_extension_utils.cpp",
+    "$validation_layer_dir/layers/utils/vk_layer_extension_utils.h",
+    "$validation_layer_dir/layers/vulkan/generated/vk_api_version.h",
+    "$validation_layer_dir/layers/vulkan/generated/vk_dispatch_table_helper.h",
+    "$validation_layer_dir/layers/vulkan/generated/vk_extension_helper.h",
+    "$validation_layer_dir/layers/vulkan/generated/vk_layer_dispatch_table.h",
   ]
 
   public_deps = [ "//third_party/Vulkan-Headers:vulkan_headers" ]
 }
 
 loadable_module("swapchain") {
+  #TODO(b/319117470) - remove to complete soft transition
+  check_includes = false
   output_name = "VkLayer_image_pipe_swapchain"
   sources = [
     "fuchsia_platform_event.cc",
@@ -113,6 +120,8 @@ source_set("display") {
 }
 
 loadable_module("fb") {
+  #TODO(b/319117470) - remove to complete soft transition
+  check_includes = false
   output_name = "VkLayer_image_pipe_swapchain_fb"
   defines = [ "USE_IMAGEPIPE_SURFACE_FB" ]
   sources = [ "image_pipe_swapchain_layer.cc" ]
@@ -139,6 +148,8 @@ group("image_pipe_swapchain_fb_layer") {
 }
 
 loadable_module("fb_skip_present") {
+  #TODO(b/319117470) - remove to complete soft transition
+  check_includes = false
   output_name = "VkLayer_image_pipe_swapchain_fb_skip_present"
   defines = [
     "USE_IMAGEPIPE_SURFACE_FB",
@@ -168,6 +179,8 @@ group("image_pipe_swapchain_fb_skip_present_layer") {
 }
 
 loadable_module("copy") {
+  #TODO(b/319117470) - remove to complete soft transition
+  check_includes = false
   testonly = true  # Not intended for production use
   output_name = "VkLayer_image_pipe_swapchain_copy"
   defines = [ "USE_SWAPCHAIN_SURFACE_COPY" ]

src/lib/vulkan/swapchain/image_pipe_swapchain_layer.cc

@@ -48,7 +48,6 @@ constexpr bool kSkipPresent = false;
 #endif
 
 #include <vk_dispatch_table_helper.h>
-#include <vk_layer_data.h>
 #include <vk_layer_extension_utils.h>
 
 #include <limits>
@@ -58,6 +57,11 @@ constexpr bool kSkipPresent = false;
 
 #include "vk_layer_dispatch_table.h"
 
+// Older headers defined this for us
+#ifndef VK_LAYER_EXPORT
+#define VK_LAYER_EXPORT __attribute__((visibility("default")))
+#endif
+
 namespace {
 // The loader dispatch table may be a different version from the layer's, and can't be used
 // directly.
@@ -585,9 +589,9 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateImagePipeSurfaceFUCHSIA(
     VkInstance instance, const VkImagePipeSurfaceCreateInfoFUCHSIA* pCreateInfo,
     const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
 #elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
-VKAPI_ATTR VkResult VKAPI_CALL
-CreateWaylandSurfaceKHR(VkInstance instance, const VkWaylandSurfaceCreateInfoKHR* pCreateInfo,
-                        const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
+VKAPI_ATTR VkResult VKAPI_CALL CreateWaylandSurfaceKHR(
+    VkInstance instance, const VkWaylandSurfaceCreateInfoKHR* pCreateInfo,
+    const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
 
 #else
 #error Unsupported
@@ -627,9 +631,9 @@ VKAPI_ATTR void VKAPI_CALL DestroySurfaceKHR(VkInstance instance, VkSurfaceKHR v
   delete surface;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL
-GetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
-                                        VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) {
+VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfaceCapabilitiesKHR(
+    VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
+    VkSurfaceCapabilitiesKHR* pSurfaceCapabilities) {
   VkLayerInstanceDispatchTable* instance_dispatch_table =
       GetLayerDataPtr(get_dispatch_key(physicalDevice), layer_data_map)
           ->instance_dispatch_table.get();
@@ -662,9 +666,9 @@ GetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfa
   return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL
-GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, const VkSurfaceKHR surface,
-                                   uint32_t* pCount, VkSurfaceFormatKHR* pSurfaceFormats) {
+VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfaceFormatsKHR(
+    VkPhysicalDevice physicalDevice, const VkSurfaceKHR surface, uint32_t* pCount,
+    VkSurfaceFormatKHR* pSurfaceFormats) {
   SupportedImageProperties& supported_properties =
       reinterpret_cast<ImagePipeSurface*>(surface)->GetSupportedImageProperties();
   if (pSurfaceFormats == nullptr) {
@@ -679,9 +683,9 @@ GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, const VkSurf
   return VK_SUCCESS;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL
-GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, const VkSurfaceKHR surface,
-                                        uint32_t* pCount, VkPresentModeKHR* pPresentModes) {
+VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceSurfacePresentModesKHR(
+    VkPhysicalDevice physicalDevice, const VkSurfaceKHR surface, uint32_t* pCount,
+    VkPresentModeKHR* pPresentModes) {
   LayerData* layer_data = GetLayerDataPtr(get_dispatch_key(physicalDevice), layer_data_map);
   return reinterpret_cast<ImagePipeSurface*>(surface)->GetPresentModes(
       physicalDevice, layer_data->instance_dispatch_table.get(), pCount, pPresentModes);
@@ -889,9 +893,9 @@ VKAPI_ATTR VkResult VKAPI_CALL EnumerateInstanceExtensionProperties(
   return VK_ERROR_LAYER_NOT_PRESENT;
 }
 
-VKAPI_ATTR VkResult VKAPI_CALL
-EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char* pLayerName,
-                                   uint32_t* pCount, VkExtensionProperties* pProperties) {
+VKAPI_ATTR VkResult VKAPI_CALL EnumerateDeviceExtensionProperties(
+    VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pCount,
+    VkExtensionProperties* pProperties) {
   if (pLayerName && !strcmp(pLayerName, swapchain_layer.layerName))
     return util_GetExtensionProperties(std::size(device_extensions), device_extensions, pCount,
                                        pProperties);
@@ -1070,8 +1074,8 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionPrope
                                                                     pProperties);
 }
 
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
-vkEnumerateInstanceLayerProperties(uint32_t* pCount, VkLayerProperties* pProperties) {
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(
+    uint32_t* pCount, VkLayerProperties* pProperties) {
   return image_pipe_swapchain::EnumerateInstanceLayerProperties(pCount, pProperties);
 }
 
@@ -1081,9 +1085,9 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties(
   return image_pipe_swapchain::EnumerateDeviceLayerProperties(VK_NULL_HANDLE, pCount, pProperties);
 }
 
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL
-vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char* pLayerName,
-                                     uint32_t* pCount, VkExtensionProperties* pProperties) {
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties(
+    VkPhysicalDevice physicalDevice, const char* pLayerName, uint32_t* pCount,
+    VkExtensionProperties* pProperties) {
   assert(physicalDevice == VK_NULL_HANDLE);
   return image_pipe_swapchain::EnumerateDeviceExtensionProperties(VK_NULL_HANDLE, pLayerName,
                                                                   pCount, pProperties);
@@ -1094,7 +1098,7 @@ VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkD
   return image_pipe_swapchain::GetDeviceProcAddr(dev, funcName);
 }
 
-VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
-vkGetInstanceProcAddr(VkInstance instance, const char* funcName) {
+VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(
+    VkInstance instance, const char* funcName) {
   return image_pipe_swapchain::GetInstanceProcAddr(instance, funcName);
 }

src/lib/vulkan/validation_layers/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/dist/resource.gni")
-import("//third_party/Vulkan-ValidationLayers/build-gn/layers-fuchsia.gni")
+import("//third_party/Vulkan-ValidationLayers/scripts/gn/layers-fuchsia.gni")
 
 # This defines a target that any fuchsia_component() or fuchsia_package()
 # can simply depend on to get the Vulkan validation layers loadable modules