[Fuchsia] Add ifndefs to vulkan_fuchsia_ext.h

This allows chromium to build with upstream headers that include these extension. The old TEMP enums and structure types are used until drivers have been updated to support upstream header values. Bug: chromium:1191605 Change-Id: I25d2991204ca34956298013138af8f48e0aaefaf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2782765 Commit-Queue: David Reveman <reveman@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

[Fuchsia] Add ifndefs to vulkan_fuchsia_ext.h
3fd439c2 · David Reveman · Commit Bot · d1462228 · 3fd439c2 · 3fd439c2
Commit 3fd439c2 authored Mar 23, 2021 by David Reveman Committed by Commit Bot Mar 24, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

vulkan_fuchsia_ext.h include/vulkan/vulkan_fuchsia_ext.h +13 -9

SemaphoreVk.cpp src/libANGLE/renderer/vulkan/SemaphoreVk.cpp +1 -1

No files found.
--- a/include/vulkan/vulkan_fuchsia_ext.h
+++ b/include/vulkan/vulkan_fuchsia_ext.h
@@ -47,9 +47,10 @@ const VkExternalSemaphoreHandleTypeFlagBits
    VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA =
        static_cast<VkExternalSemaphoreHandleTypeFlagBits>(0x00100000);

-#define VK_FUCHSIA_external_memory 1
-#define VK_FUCHSIA_EXTERNAL_MEMORY_SPEC_VERSION 1
-#define VK_FUCHSIA_EXTERNAL_MEMORY_EXTENSION_NAME "VK_FUCHSIA_external_memory"
+#ifndef VK_FUCHSIA_external_memory
+#    define VK_FUCHSIA_external_memory 1
+#    define VK_FUCHSIA_EXTERNAL_MEMORY_SPEC_VERSION 1
+#    define VK_FUCHSIA_EXTERNAL_MEMORY_EXTENSION_NAME "VK_FUCHSIA_external_memory"

 typedef struct VkImportMemoryZirconHandleInfoFUCHSIA
 {
@@ -84,7 +85,7 @@ typedef VkResult(VKAPI_PTR *PFN_vkGetMemoryZirconHandlePropertiesFUCHSIA)(
    zx_handle_t ZirconHandle,
    VkMemoryZirconHandlePropertiesFUCHSIA *pMemoryZirconHandleProperties);

-#ifndef VK_NO_PROTOTYPES
+#    ifndef VK_NO_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL
 vkGetMemoryZirconHandleFUCHSIA(VkDevice device,
                               const VkMemoryGetZirconHandleInfoFUCHSIA *pGetZirconHandleInfo,
@@ -95,11 +96,13 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryZirconHandlePropertiesFUCHSIA(
    VkExternalMemoryHandleTypeFlagBits handleType,
    zx_handle_t ZirconHandle,
    VkMemoryZirconHandlePropertiesFUCHSIA *pMemoryZirconHandleProperties);
+#    endif
 #endif

-#define VK_FUCHSIA_external_semaphore 1
-#define VK_FUCHSIA_EXTERNAL_SEMAPHORE_SPEC_VERSION 1
-#define VK_FUCHSIA_EXTERNAL_SEMAPHORE_EXTENSION_NAME "VK_FUCHSIA_external_semaphore"
+#ifndef VK_FUCHSIA_external_semaphore
+#    define VK_FUCHSIA_external_semaphore 1
+#    define VK_FUCHSIA_EXTERNAL_SEMAPHORE_SPEC_VERSION 1
+#    define VK_FUCHSIA_EXTERNAL_SEMAPHORE_EXTENSION_NAME "VK_FUCHSIA_external_semaphore"

 typedef struct VkImportSemaphoreZirconHandleInfoFUCHSIA
 {
@@ -108,7 +111,7 @@ typedef struct VkImportSemaphoreZirconHandleInfoFUCHSIA
    VkSemaphore semaphore;
    VkSemaphoreImportFlags flags;
    VkExternalSemaphoreHandleTypeFlagBits handleType;
-    zx_handle_t handle;
+    zx_handle_t zirconHandle;
 } VkImportSemaphoreZirconHandleInfoFUCHSIA;

 typedef struct VkSemaphoreGetZirconHandleInfoFUCHSIA
@@ -127,7 +130,7 @@ typedef VkResult(VKAPI_PTR *PFN_vkGetSemaphoreZirconHandleFUCHSIA)(
    const VkSemaphoreGetZirconHandleInfoFUCHSIA *pGetZirconHandleInfo,
    zx_handle_t *pZirconHandle);

-#ifndef VK_NO_PROTOTYPES
+#    ifndef VK_NO_PROTOTYPES
 VKAPI_ATTR VkResult VKAPI_CALL vkImportSemaphoreZirconHandleFUCHSIA(
    VkDevice device,
    const VkImportSemaphoreZirconHandleInfoFUCHSIA *pImportSemaphoreZirconHandleInfo);
@@ -136,6 +139,7 @@ VKAPI_ATTR VkResult VKAPI_CALL
 vkGetSemaphoreZirconHandleFUCHSIA(VkDevice device,
                                  const VkSemaphoreGetZirconHandleInfoFUCHSIA *pGetZirconHandleInfo,
                                  zx_handle_t *pZirconHandle);
+#    endif
 #endif

 #ifdef __cplusplus

--- a/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SemaphoreVk.cpp
@@ -261,7 +261,7 @@ angle::Result SemaphoreVk::importZirconEvent(ContextVk *contextVk, GLuint handle
    importSemaphoreZirconHandleInfo.flags     = 0;
    importSemaphoreZirconHandleInfo.handleType =
        VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA;
-    importSemaphoreZirconHandleInfo.handle = handle;
+    importSemaphoreZirconHandleInfo.zirconHandle = handle;

    // TODO(spang): Add vkImportSemaphoreZirconHandleFUCHSIA to volk.
    static PFN_vkImportSemaphoreZirconHandleFUCHSIA vkImportSemaphoreZirconHandleFUCHSIA =