@shopify/react-native-skia 2.6.5 → 2.6.6

package/cpp/skia/include/private/base/SkMacros.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/base/SkMalloc.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/base/SkSafe32.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/base/SkSpan_impl.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/base/SkTDArray.h

@@ -17,6 +17,8 @@
 #include <initializer_list>
 #include <utility>
 
+// We'd prefer not to use these types anymore. SkTDArray can be replaced skia_private::TArray
+
 class SK_SPI SkTDStorage {
 public:
     explicit SkTDStorage(int sizeOfT);
@@ -76,7 +78,17 @@ public:
     }
 
 private:
-    size_t bytes(int n) const { return SkToSizeT(n * fSizeOfT); }
+    // Fast path for pointer arithmetic. Assumes 'n' has already been bounds-checked.
+    size_t bytes(int n) const { return SkToSizeT(n) * SkToSizeT(fSizeOfT); }
+
+    // Safe path for memory allocations; protects against 32-bit overflow.
+    size_t safe_bytes(int n) const {
+        size_t size = SkToSizeT(n);
+        size_t sizeOfT = SkToSizeT(fSizeOfT);
+        SkASSERT_RELEASE(size <= SIZE_MAX / sizeOfT);
+        return size * sizeOfT;
+    }
+
     void* address(int n) { return fStorage + this->bytes(n); }
 
     // Adds delta to fSize. Crash if outside [0, INT_MAX]

package/cpp/skia/include/private/base/SkTPin.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/base/SkTo.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/chromium/SkChromeRemoteGlyphCache.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC.
+ * Copyright 2021 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/chromium/SkCodecsICCProfileChromium.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCodecsICCProfileChromium_DEFINED
+#define SkCodecsICCProfileChromium_DEFINED
+
+#include <memory>
+
+#include "include/core/SkData.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/skcms/skcms.h"
+
+namespace SkCodecs {
+
+// Allows Chromium code that does not use SkCodec to parse ICC profiles
+// using the same parser that SkCodec uses (skcms or moxcms).
+class SK_API ICCProfileChromium {
+public:
+    virtual ~ICCProfileChromium() = default;
+
+    // Force all ICC profile parsing to use skcms instead of the build-default
+    // parser. This is intended for Chromium to have a kill-switch to fall back
+    // to skcms if moxcms causes issues in the field.
+    //
+    // This is a global setting and is NOT thread-safe with respect to concurrent
+    // codec operations. It should be called once early during process startup.
+    static void ForceSkcms(bool forceSkcms);
+
+    // Returns nullptr if parsing fails. May retain `data`. Uses the parser
+    // selected by ForceSkcms (defaults to the build-default parser).
+    static std::unique_ptr<ICCProfileChromium> Make(sk_sp<SkData> data);
+
+    // Return the parsed profile. The pointers in the structure are guaranteed
+    // to be valid until `this` is destroyed.
+    virtual const skcms_ICCProfile& GetProfile() const = 0;
+
+protected:
+    ICCProfileChromium() = default;
+
+private:
+    ICCProfileChromium(const ICCProfileChromium&) = delete;
+    ICCProfileChromium& operator=(const ICCProfileChromium&) = delete;
+};
+
+}  // namespace SkCodecs
+
+#endif  // SkCodecsICCProfileChromium_DEFINED

package/cpp/skia/include/private/chromium/SkExifChromium.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkExifChromium_DEFINED
+#define SkExifChromium_DEFINED
+
+#include "include/private/base/SkAPI.h"
+
+namespace SkExif {
+
+// Force all EXIF parsing to use the C++ SkExif parser instead of the
+// build-default parser. This is intended for Chromium to have a kill-switch
+// to fall back to the C++ implementation if rust_exif causes issues in the
+// field.
+//
+// This is a global setting and is NOT thread-safe with respect to concurrent
+// codec operations. It should be called once early during process startup.
+SK_API void ForceSkExif(bool forceSkExif);
+
+}  // namespace SkExif
+
+#endif  // SkExifChromium_DEFINED

package/cpp/skia/include/private/gpu/ganesh/GrContext_Base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/gpu/ganesh/GrImageContext.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/gpu/ganesh/GrTypesPriv.h

@@ -621,7 +621,7 @@ static constexpr SkColorType GrColorTypeToSkColorType(GrColorType ct) {
         case GrColorType::kRGB_888:          return kUnknown_SkColorType;
         case GrColorType::kR_8:              return kR8_unorm_SkColorType;
         case GrColorType::kR_16:             return kR16_unorm_SkColorType;
-        case GrColorType::kR_F16:            return kUnknown_SkColorType;
+        case GrColorType::kR_F16:            return kR16_float_SkColorType;
         case GrColorType::kGray_F16:         return kUnknown_SkColorType;
         case GrColorType::kARGB_4444:        return kUnknown_SkColorType;
         case GrColorType::kBGRA_4444:        return kUnknown_SkColorType;
@@ -656,6 +656,7 @@ static constexpr GrColorType SkColorTypeToGrColorType(SkColorType ct) {
         case kR16_unorm_SkColorType:          return GrColorType::kR_16;
         case kR16G16_unorm_SkColorType:       return GrColorType::kRG_1616;
         case kA16_float_SkColorType:          return GrColorType::kAlpha_F16;
+        case kR16_float_SkColorType:          return GrColorType::kR_F16;
         case kR16G16_float_SkColorType:       return GrColorType::kRG_F16;
         case kR16G16B16A16_unorm_SkColorType: return GrColorType::kRGBA_16161616;
         case kR8_unorm_SkColorType:           return GrColorType::kR_8;

package/cpp/skia/include/private/gpu/vk/SkiaVulkan.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/sksl/SkSLDebugTrace.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC.
+ * Copyright 2021 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/third_party/vulkan/vulkan/vk_icd.h

@@ -7,8 +7,8 @@
  */
 #pragma once
 
-#include <stdbool.h>
 #include "vulkan.h"
+#include <stdbool.h>
 
 // Loader-ICD version negotiation API.  Versions add the following features:
 //   Version 0 - Initial.  Doesn't support vk_icdGetInstanceProcAddr
@@ -41,26 +41,21 @@
 #define MIN_PHYS_DEV_EXTENSION_ICD_INTERFACE_VERSION 4
 
 // Old typedefs that don't follow a proper naming convention but are preserved for compatibility
-typedef VkResult(VKAPI_PTR* PFN_vkNegotiateLoaderICDInterfaceVersion)(uint32_t* pVersion);
-// This is defined in vk_layer.h which will be found by the loader, but if an ICD is building
-// against this file directly, it won't be found.
-#ifndef PFN_GetPhysicalDeviceProcAddr
-typedef PFN_vkVoidFunction(VKAPI_PTR* PFN_GetPhysicalDeviceProcAddr)(VkInstance instance,
-                                                                     const char* pName);
+typedef VkResult(VKAPI_PTR *PFN_vkNegotiateLoaderICDInterfaceVersion)(uint32_t *pVersion);
+// This is defined in vk_layer.h which will be found by the loader, but if an ICD is building against this
+// file directly, it won't be found.
+#ifndef IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
+typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName);
+#define IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
 #endif
 
 // Typedefs for loader/ICD interface
-typedef VkResult(VKAPI_PTR* PFN_vk_icdNegotiateLoaderICDInterfaceVersion)(uint32_t* pVersion);
-typedef PFN_vkVoidFunction(VKAPI_PTR* PFN_vk_icdGetInstanceProcAddr)(VkInstance instance,
-                                                                     const char* pName);
-typedef PFN_vkVoidFunction(VKAPI_PTR* PFN_vk_icdGetPhysicalDeviceProcAddr)(VkInstance instance,
-                                                                           const char* pName);
+typedef VkResult (VKAPI_PTR *PFN_vk_icdNegotiateLoaderICDInterfaceVersion)(uint32_t* pVersion);
+typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vk_icdGetInstanceProcAddr)(VkInstance instance, const char* pName);
+typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vk_icdGetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
 #if defined(VK_USE_PLATFORM_WIN32_KHR)
-typedef VkResult(VKAPI_PTR* PFN_vk_icdEnumerateAdapterPhysicalDevices)(
-        VkInstance instance,
-        LUID adapterLUID,
-        uint32_t* pPhysicalDeviceCount,
-        VkPhysicalDevice* pPhysicalDevices);
+typedef VkResult (VKAPI_PTR *PFN_vk_icdEnumerateAdapterPhysicalDevices)(VkInstance instance, LUID adapterLUID,
+    uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);
 #endif
 
 // Prototypes for loader/ICD interface
@@ -68,17 +63,12 @@ typedef VkResult(VKAPI_PTR* PFN_vk_icdEnumerateAdapterPhysicalDevices)(
 #ifdef __cplusplus
 extern "C" {
 #endif
-VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pVersion);
-VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance,
-                                                                   const char* pName);
-VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr(VkInstance instance,
-                                                                         const char* pName);
+    VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pVersion);
+    VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName);
+    VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char* pName);
 #if defined(VK_USE_PLATFORM_WIN32_KHR)
-VKAPI_ATTR VkResult VKAPI_CALL
-vk_icdEnumerateAdapterPhysicalDevices(VkInstance instance,
-                                      LUID adapterLUID,
-                                      uint32_t* pPhysicalDeviceCount,
-                                      VkPhysicalDevice* pPhysicalDevices);
+    VKAPI_ATTR VkResult VKAPI_CALL vk_icdEnumerateAdapterPhysicalDevices(VkInstance instance, LUID adapterLUID,
+        uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices);
 #endif
 #ifdef __cplusplus
 }
@@ -95,16 +85,16 @@ vk_icdEnumerateAdapterPhysicalDevices(VkInstance instance,
 
 typedef union {
     uintptr_t loaderMagic;
-    void* loaderData;
+    void *loaderData;
 } VK_LOADER_DATA;
 
-static inline void set_loader_magic_value(void* pNewObject) {
-    VK_LOADER_DATA* loader_info = (VK_LOADER_DATA*)pNewObject;
+static inline void set_loader_magic_value(void *pNewObject) {
+    VK_LOADER_DATA *loader_info = (VK_LOADER_DATA *)pNewObject;
     loader_info->loaderMagic = ICD_LOADER_MAGIC;
 }
 
-static inline bool valid_loader_magic_value(void* pNewObject) {
-    const VK_LOADER_DATA* loader_info = (VK_LOADER_DATA*)pNewObject;
+static inline bool valid_loader_magic_value(void *pNewObject) {
+    const VK_LOADER_DATA *loader_info = (VK_LOADER_DATA *)pNewObject;
     return (loader_info->loaderMagic & 0xffffffff) == ICD_LOADER_MAGIC;
 }
 
@@ -138,16 +128,16 @@ typedef struct {
 #ifdef VK_USE_PLATFORM_MIR_KHR
 typedef struct {
     VkIcdSurfaceBase base;
-    MirConnection* connection;
-    MirSurface* mirSurface;
+    MirConnection *connection;
+    MirSurface *mirSurface;
 } VkIcdSurfaceMir;
 #endif  // VK_USE_PLATFORM_MIR_KHR
 
 #ifdef VK_USE_PLATFORM_WAYLAND_KHR
 typedef struct {
     VkIcdSurfaceBase base;
-    struct wl_display* display;
-    struct wl_surface* surface;
+    struct wl_display *display;
+    struct wl_surface *surface;
 } VkIcdSurfaceWayland;
 #endif  // VK_USE_PLATFORM_WAYLAND_KHR
 
@@ -162,7 +152,7 @@ typedef struct {
 #ifdef VK_USE_PLATFORM_XCB_KHR
 typedef struct {
     VkIcdSurfaceBase base;
-    xcb_connection_t* connection;
+    xcb_connection_t *connection;
     xcb_window_t window;
 } VkIcdSurfaceXcb;
 #endif  // VK_USE_PLATFORM_XCB_KHR
@@ -170,7 +160,7 @@ typedef struct {
 #ifdef VK_USE_PLATFORM_XLIB_KHR
 typedef struct {
     VkIcdSurfaceBase base;
-    Display* dpy;
+    Display *dpy;
     Window window;
 } VkIcdSurfaceXlib;
 #endif  // VK_USE_PLATFORM_XLIB_KHR
@@ -178,29 +168,29 @@ typedef struct {
 #ifdef VK_USE_PLATFORM_DIRECTFB_EXT
 typedef struct {
     VkIcdSurfaceBase base;
-    IDirectFB* dfb;
-    IDirectFBSurface* surface;
+    IDirectFB *dfb;
+    IDirectFBSurface *surface;
 } VkIcdSurfaceDirectFB;
 #endif  // VK_USE_PLATFORM_DIRECTFB_EXT
 
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
 typedef struct {
     VkIcdSurfaceBase base;
-    struct ANativeWindow* window;
+    struct ANativeWindow *window;
 } VkIcdSurfaceAndroid;
 #endif  // VK_USE_PLATFORM_ANDROID_KHR
 
 #ifdef VK_USE_PLATFORM_MACOS_MVK
 typedef struct {
     VkIcdSurfaceBase base;
-    const void* pView;
+    const void *pView;
 } VkIcdSurfaceMacOS;
 #endif  // VK_USE_PLATFORM_MACOS_MVK
 
 #ifdef VK_USE_PLATFORM_IOS_MVK
 typedef struct {
     VkIcdSurfaceBase base;
-    const void* pView;
+    const void *pView;
 } VkIcdSurfaceIOS;
 #endif  // VK_USE_PLATFORM_IOS_MVK
 
@@ -229,27 +219,27 @@ typedef struct {
 #ifdef VK_USE_PLATFORM_METAL_EXT
 typedef struct {
     VkIcdSurfaceBase base;
-    const CAMetalLayer* pLayer;
+    const CAMetalLayer *pLayer;
 } VkIcdSurfaceMetal;
-#endif  // VK_USE_PLATFORM_METAL_EXT
+#endif // VK_USE_PLATFORM_METAL_EXT
 
 #ifdef VK_USE_PLATFORM_VI_NN
 typedef struct {
     VkIcdSurfaceBase base;
-    void* window;
+    void *window;
 } VkIcdSurfaceVi;
-#endif  // VK_USE_PLATFORM_VI_NN
+#endif // VK_USE_PLATFORM_VI_NN
 
 #ifdef VK_USE_PLATFORM_SCREEN_QNX
 typedef struct {
     VkIcdSurfaceBase base;
-    struct _screen_context* context;
-    struct _screen_window* window;
+    struct _screen_context *context;
+    struct _screen_window *window;
 } VkIcdSurfaceScreen;
 #endif  // VK_USE_PLATFORM_SCREEN_QNX
 
 #ifdef VK_USE_PLATFORM_FUCHSIA
 typedef struct {
-    VkIcdSurfaceBase base;
+  VkIcdSurfaceBase base;
 } VkIcdSurfaceImagePipe;
-#endif  // VK_USE_PLATFORM_FUCHSIA
+#endif // VK_USE_PLATFORM_FUCHSIA

package/cpp/skia/include/third_party/vulkan/vulkan/vk_layer.h

@@ -16,19 +16,21 @@
 
 #define MAX_NUM_UNKNOWN_EXTS 250
 
-// Loader-Layer version negotiation API.  Versions add the following features:
-//   Versions 0/1 - Initial.  Doesn't support vk_layerGetPhysicalDeviceProcAddr
-//                  or vk_icdNegotiateLoaderLayerInterfaceVersion.
-//   Version 2    - Add support for vk_layerGetPhysicalDeviceProcAddr and
-//                  vk_icdNegotiateLoaderLayerInterfaceVersion.
+ // Loader-Layer version negotiation API.  Versions add the following features:
+ //   Versions 0/1 - Initial.  Doesn't support vk_layerGetPhysicalDeviceProcAddr
+ //                  or vk_icdNegotiateLoaderLayerInterfaceVersion.
+ //   Version 2    - Add support for vk_layerGetPhysicalDeviceProcAddr and
+ //                  vk_icdNegotiateLoaderLayerInterfaceVersion.
 #define CURRENT_LOADER_LAYER_INTERFACE_VERSION 2
 #define MIN_SUPPORTED_LOADER_LAYER_INTERFACE_VERSION 1
 
 #define VK_CURRENT_CHAIN_VERSION 1
 
 // Typedef for use in the interfaces below
-typedef PFN_vkVoidFunction(VKAPI_PTR* PFN_GetPhysicalDeviceProcAddr)(VkInstance instance,
-                                                                     const char* pName);
+#ifndef IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
+typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
+#define IS_DEFINED_PFN_GetPhysicalDeviceProcAddr
+#endif
 
 // Version negotiation values
 typedef enum VkNegotiateLayerStructType {
@@ -39,7 +41,7 @@ typedef enum VkNegotiateLayerStructType {
 // Version negotiation structures
 typedef struct VkNegotiateLayerInterface {
     VkNegotiateLayerStructType sType;
-    void* pNext;
+    void *pNext;
     uint32_t loaderLayerInterfaceVersion;
     PFN_vkGetInstanceProcAddr pfnGetInstanceProcAddr;
     PFN_vkGetDeviceProcAddr pfnGetDeviceProcAddr;
@@ -47,11 +49,10 @@ typedef struct VkNegotiateLayerInterface {
 } VkNegotiateLayerInterface;
 
 // Version negotiation functions
-typedef VkResult(VKAPI_PTR* PFN_vkNegotiateLoaderLayerInterfaceVersion)(
-        VkNegotiateLayerInterface* pVersionStruct);
+typedef VkResult (VKAPI_PTR *PFN_vkNegotiateLoaderLayerInterfaceVersion)(VkNegotiateLayerInterface *pVersionStruct);
 
 // Function prototype for unknown physical device extension command
-typedef VkResult(VKAPI_PTR* PFN_PhysDevExt)(VkPhysicalDevice phys_device);
+typedef VkResult(VKAPI_PTR *PFN_PhysDevExt)(VkPhysicalDevice phys_device);
 
 // ------------------------------------------------------------------------------------------------
 // CreateInstance and CreateDevice support structures
@@ -69,7 +70,7 @@ typedef enum VkLayerFunction_ {
 } VkLayerFunction;
 
 typedef struct VkLayerInstanceLink_ {
-    struct VkLayerInstanceLink_* pNext;
+    struct VkLayerInstanceLink_ *pNext;
     PFN_vkGetInstanceProcAddr pfnNextGetInstanceProcAddr;
     PFN_GetPhysicalDeviceProcAddr pfnNextGetPhysicalDeviceProcAddr;
 } VkLayerInstanceLink;
@@ -82,22 +83,17 @@ typedef struct VkLayerInstanceLink_ {
  * exact instance being used.
  */
 typedef struct VkLayerDeviceInfo_ {
-    void* device_info;
+    void *device_info;
     PFN_vkGetInstanceProcAddr pfnNextGetInstanceProcAddr;
 } VkLayerDeviceInfo;
 
-typedef VkResult(VKAPI_PTR* PFN_vkSetInstanceLoaderData)(VkInstance instance, void* object);
-typedef VkResult(VKAPI_PTR* PFN_vkSetDeviceLoaderData)(VkDevice device, void* object);
-typedef VkResult(VKAPI_PTR* PFN_vkLayerCreateDevice)(VkInstance instance,
-                                                     VkPhysicalDevice physicalDevice,
-                                                     const VkDeviceCreateInfo* pCreateInfo,
-                                                     const VkAllocationCallbacks* pAllocator,
-                                                     VkDevice* pDevice,
-                                                     PFN_vkGetInstanceProcAddr layerGIPA,
-                                                     PFN_vkGetDeviceProcAddr* nextGDPA);
-typedef void(VKAPI_PTR* PFN_vkLayerDestroyDevice)(VkDevice physicalDevice,
-                                                  const VkAllocationCallbacks* pAllocator,
-                                                  PFN_vkDestroyDevice destroyFunction);
+typedef VkResult (VKAPI_PTR *PFN_vkSetInstanceLoaderData)(VkInstance instance,
+        void *object);
+typedef VkResult (VKAPI_PTR *PFN_vkSetDeviceLoaderData)(VkDevice device,
+        void *object);
+typedef VkResult (VKAPI_PTR *PFN_vkLayerCreateDevice)(VkInstance instance, VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo,
+						      const VkAllocationCallbacks *pAllocator, VkDevice *pDevice, PFN_vkGetInstanceProcAddr layerGIPA, PFN_vkGetDeviceProcAddr *nextGDPA);
+typedef void (VKAPI_PTR *PFN_vkLayerDestroyDevice)(VkDevice physicalDevice, const VkAllocationCallbacks *pAllocator, PFN_vkDestroyDevice destroyFunction);
 
 typedef enum VkLoaderFeastureFlagBits {
     VK_LOADER_FEATURE_PHYSICAL_DEVICE_SORTING = 0x00000001,
@@ -105,32 +101,32 @@ typedef enum VkLoaderFeastureFlagBits {
 typedef VkFlags VkLoaderFeatureFlags;
 
 typedef struct {
-    VkStructureType sType;  // VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO
-    const void* pNext;
+    VkStructureType sType; // VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO
+    const void *pNext;
     VkLayerFunction function;
     union {
-        VkLayerInstanceLink* pLayerInfo;
+        VkLayerInstanceLink *pLayerInfo;
         PFN_vkSetInstanceLoaderData pfnSetInstanceLoaderData;
         struct {
-            PFN_vkLayerCreateDevice pfnLayerCreateDevice;
-            PFN_vkLayerDestroyDevice pfnLayerDestroyDevice;
-        } layerDevice;
+	        PFN_vkLayerCreateDevice pfnLayerCreateDevice;
+	        PFN_vkLayerDestroyDevice pfnLayerDestroyDevice;
+	    } layerDevice;
         VkLoaderFeatureFlags loaderFeatures;
     } u;
 } VkLayerInstanceCreateInfo;
 
 typedef struct VkLayerDeviceLink_ {
-    struct VkLayerDeviceLink_* pNext;
+    struct VkLayerDeviceLink_ *pNext;
     PFN_vkGetInstanceProcAddr pfnNextGetInstanceProcAddr;
     PFN_vkGetDeviceProcAddr pfnNextGetDeviceProcAddr;
 } VkLayerDeviceLink;
 
 typedef struct {
-    VkStructureType sType;  // VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO
-    const void* pNext;
+    VkStructureType sType; // VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO
+    const void *pNext;
     VkLayerFunction function;
     union {
-        VkLayerDeviceLink* pLayerInfo;
+        VkLayerDeviceLink *pLayerInfo;
         PFN_vkSetDeviceLoaderData pfnSetDeviceLoaderData;
     } u;
 } VkLayerDeviceCreateInfo;
@@ -139,8 +135,7 @@ typedef struct {
 extern "C" {
 #endif
 
-VKAPI_ATTR VkResult VKAPI_CALL
-vkNegotiateLoaderLayerInterfaceVersion(VkNegotiateLayerInterface* pVersionStruct);
+VKAPI_ATTR VkResult VKAPI_CALL vkNegotiateLoaderLayerInterfaceVersion(VkNegotiateLayerInterface *pVersionStruct);
 
 typedef enum VkChainType {
     VK_CHAIN_TYPE_UNKNOWN = 0,
@@ -157,16 +152,12 @@ typedef struct VkChainHeader {
 
 typedef struct VkEnumerateInstanceExtensionPropertiesChain {
     VkChainHeader header;
-    VkResult(VKAPI_PTR* pfnNextLayer)(const struct VkEnumerateInstanceExtensionPropertiesChain*,
-                                      const char*,
-                                      uint32_t*,
-                                      VkExtensionProperties*);
-    const struct VkEnumerateInstanceExtensionPropertiesChain* pNextLink;
+    VkResult(VKAPI_PTR *pfnNextLayer)(const struct VkEnumerateInstanceExtensionPropertiesChain *, const char *, uint32_t *,
+                                      VkExtensionProperties *);
+    const struct VkEnumerateInstanceExtensionPropertiesChain *pNextLink;
 
 #if defined(__cplusplus)
-    inline VkResult CallDown(const char* pLayerName,
-                             uint32_t* pPropertyCount,
-                             VkExtensionProperties* pProperties) const {
+    inline VkResult CallDown(const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) const {
         return pfnNextLayer(pNextLink, pLayerName, pPropertyCount, pProperties);
     }
 #endif
@@ -174,13 +165,11 @@ typedef struct VkEnumerateInstanceExtensionPropertiesChain {
 
 typedef struct VkEnumerateInstanceLayerPropertiesChain {
     VkChainHeader header;
-    VkResult(VKAPI_PTR* pfnNextLayer)(const struct VkEnumerateInstanceLayerPropertiesChain*,
-                                      uint32_t*,
-                                      VkLayerProperties*);
-    const struct VkEnumerateInstanceLayerPropertiesChain* pNextLink;
+    VkResult(VKAPI_PTR *pfnNextLayer)(const struct VkEnumerateInstanceLayerPropertiesChain *, uint32_t *, VkLayerProperties *);
+    const struct VkEnumerateInstanceLayerPropertiesChain *pNextLink;
 
 #if defined(__cplusplus)
-    inline VkResult CallDown(uint32_t* pPropertyCount, VkLayerProperties* pProperties) const {
+    inline VkResult CallDown(uint32_t *pPropertyCount, VkLayerProperties *pProperties) const {
         return pfnNextLayer(pNextLink, pPropertyCount, pProperties);
     }
 #endif
@@ -188,11 +177,11 @@ typedef struct VkEnumerateInstanceLayerPropertiesChain {
 
 typedef struct VkEnumerateInstanceVersionChain {
     VkChainHeader header;
-    VkResult(VKAPI_PTR* pfnNextLayer)(const struct VkEnumerateInstanceVersionChain*, uint32_t*);
-    const struct VkEnumerateInstanceVersionChain* pNextLink;
+    VkResult(VKAPI_PTR *pfnNextLayer)(const struct VkEnumerateInstanceVersionChain *, uint32_t *);
+    const struct VkEnumerateInstanceVersionChain *pNextLink;
 
 #if defined(__cplusplus)
-    inline VkResult CallDown(uint32_t* pApiVersion) const {
+    inline VkResult CallDown(uint32_t *pApiVersion) const {
         return pfnNextLayer(pNextLink, pApiVersion);
     }
 #endif

package/cpp/skia/include/third_party/vulkan/vulkan/vk_platform.h

@@ -2,11 +2,12 @@
 // File: vk_platform.h
 //
 /*
-** Copyright 2014-2025 The Khronos Group Inc.
+** Copyright 2014-2026 The Khronos Group Inc.
 **
 ** SPDX-License-Identifier: Apache-2.0
 */
 
+
 #ifndef VK_PLATFORM_H_
 #define VK_PLATFORM_H_