@shopify/react-native-skia 2.6.4 → 2.6.6

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

@@ -78,20 +78,20 @@
 #endif
 
 /**
- *  SK_CPU_SSE_LEVEL
+ *  SK_CPU_X64_LEVEL
  *
- *  If defined, SK_CPU_SSE_LEVEL should be set to the highest supported level.
- *  On non-intel CPU this should be undefined.
+ *  If defined, SK_CPU_X64_LEVEL should be set to the highest supported level.
+ *  On non-Intel, non-AMD CPUs this should be undefined.
  */
-#define SK_CPU_SSE_LEVEL_SSE1     10
-#define SK_CPU_SSE_LEVEL_SSE2     20
-#define SK_CPU_SSE_LEVEL_SSE3     30
-#define SK_CPU_SSE_LEVEL_SSSE3    31
-#define SK_CPU_SSE_LEVEL_SSE41    41
-#define SK_CPU_SSE_LEVEL_SSE42    42
-#define SK_CPU_SSE_LEVEL_AVX      51
-#define SK_CPU_SSE_LEVEL_AVX2     52
-#define SK_CPU_SSE_LEVEL_SKX      60
+#define SK_CPU_X64_LEVEL_SSE1     10
+#define SK_CPU_X64_LEVEL_SSE2     20
+#define SK_CPU_X64_LEVEL_SSE3     30
+#define SK_CPU_X64_LEVEL_SSSE3    31
+#define SK_CPU_X64_LEVEL_SSE41    41
+#define SK_CPU_X64_LEVEL_SSE42    42
+#define SK_CPU_X64_LEVEL_AVX      51
+#define SK_CPU_X64_LEVEL_AVX2     52
+#define SK_CPU_X64_LEVEL_ML4      60
 
 /**
  *  SK_CPU_LSX_LEVEL
@@ -99,32 +99,32 @@
  *  If defined, SK_CPU_LSX_LEVEL should be set to the highest supported level.
  *  On non-loongarch CPU this should be undefined.
  */
-#define SK_CPU_LSX_LEVEL_LSX      70
-#define SK_CPU_LSX_LEVEL_LASX     80
+#define SK_CPU_LSX_LEVEL_LSX      10
+#define SK_CPU_LSX_LEVEL_LASX     20
 
 // TODO(kjlubick) clean up these checks
 
 // Are we in GCC/Clang?
-#ifndef SK_CPU_SSE_LEVEL
+#ifndef SK_CPU_X64_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level.
     #if defined(__AVX512F__) && defined(__AVX512DQ__) && defined(__AVX512CD__) && \
         defined(__AVX512BW__) && defined(__AVX512VL__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SKX
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_ML4
     #elif defined(__AVX2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX2
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_AVX2
     #elif defined(__AVX__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_AVX
     #elif defined(__SSE4_2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE42
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE42
     #elif defined(__SSE4_1__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE41
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE41
     #elif defined(__SSSE3__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSSE3
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSSE3
     #elif defined(__SSE3__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE3
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE3
     #elif defined(__SSE2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE2
     #endif
 #endif
 
@@ -137,23 +137,23 @@
 #endif
 
 // Are we in VisualStudio?
-#ifndef SK_CPU_SSE_LEVEL
+#ifndef SK_CPU_X64_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level. 64-bit intel guarantees at least SSE2 support.
     #if defined(__AVX512F__) && defined(__AVX512DQ__) && defined(__AVX512CD__) && \
         defined(__AVX512BW__) && defined(__AVX512VL__)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_SKX
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_ML4
     #elif defined(__AVX2__)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_AVX2
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_AVX2
     #elif defined(__AVX__)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_AVX
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_AVX
     #elif defined(_M_X64) || defined(_M_AMD64)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_SSE2
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_SSE2
     #elif defined(_M_IX86_FP)
         #if _M_IX86_FP >= 2
-            #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
+            #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE2
         #elif _M_IX86_FP == 1
-            #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE1
+            #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE1
         #endif
     #endif
 #endif

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

@@ -50,16 +50,10 @@ void SK_SPI SkLog(SkLogPriority priority, const char format[], ...) SK_PRINTF_LI
 #define SKIA_LOG(priority, fmt, ...)                                           \
     do {                                                                       \
         if constexpr (priority <= SKIA_LOWEST_ACTIVE_LOG_PRIORITY) {           \
-            if constexpr (priority == SkLogPriority::kFatal) {                 \
-                SK_ABORT("[skia] " fmt, ##__VA_ARGS__);                        \
-            }                                                                  \
-            else {                                                             \
-                SkLog(priority, "[skia] " fmt "\n", ##__VA_ARGS__);            \
-            }                                                                  \
+            SkLog(priority, "[skia] " fmt "\n", ##__VA_ARGS__);                \
         }                                                                      \
     } while (0)
 
-#define SKIA_LOG_F(fmt, ...) SKIA_LOG(SkLogPriority::kFatal, "** ERROR ** " fmt, ##__VA_ARGS__)
 #define SKIA_LOG_E(fmt, ...) SKIA_LOG(SkLogPriority::kError, "** ERROR ** " fmt, ##__VA_ARGS__)
 #define SKIA_LOG_W(fmt, ...) SKIA_LOG(SkLogPriority::kWarning, "WARNING - " fmt, ##__VA_ARGS__)
 #define SKIA_LOG_I(fmt, ...) SKIA_LOG(SkLogPriority::kInfo, fmt, ##__VA_ARGS__)

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

@@ -25,11 +25,10 @@
  * However, debug logs would be omitted.
  */
 enum class SkLogPriority : int {
-    kFatal = 0,
-    kError = 1,
-    kWarning = 2,
-    kInfo = 3,
-    kDebug = 4,
+    kError = 0,
+    kWarning = 1,
+    kInfo = 2,
+    kDebug = 3,
 };
 
 #endif // SkLogPriority_DEFINED

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