From 5cf2d8efa35db5146d648f66a86b33ff21528caf Mon Sep 17 00:00:00 2001 From: Manuel Dun Date: Wed, 20 Nov 2024 14:50:09 -0400 Subject: [PATCH] gfxstream: Using DETECT_OS_FUCHSIA from util instead of __Fushsia__ The DETECT_OS_FUCHSIA constant defined in util/detect_os.h allows replacing the ocurrences of defined(__Fushsia__) and __Fuschsia__. They are equivalent in functionality but the util's one is easier to read and write. Also it does not require the define() syntax. The change involve replacing every ocurrence of defined(__Fuchsia__) with DETECT_OS_FUCHSIA. Then replacing every ocurrence of #ifdef __Fuchsia__ with #if DETECT_OS_FUCHSIA. Reviewed-by: Gurchetan Singh Part-of: --- .../GoldfishAddressSpace/include/address_space.h | 3 ++- .../include/goldfish_address_space.h | 15 ++++++++------- .../guest/vulkan/gfxstream_vk_device.cpp | 7 ++++--- src/gfxstream/guest/vulkan_enc/Resources.cpp | 2 +- src/gfxstream/guest/vulkan_enc/Resources.h | 4 ++-- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h b/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h index 90ccdbd80b3..8362fe75d81 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h @@ -7,8 +7,9 @@ #include #include +#include "util/detect_os.h" -#if defined(__Fuchsia__) +#if DETECT_OS_FUCHSIA typedef void* address_space_handle_t; #else typedef int address_space_handle_t; diff --git a/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h b/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h index 26ccb704a82..dd64087e149 100644 --- a/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h +++ b/src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h @@ -8,8 +8,9 @@ #include #include +#include "util/detect_os.h" -#ifdef __Fuchsia__ +#if DETECT_OS_FUCHSIA #include #endif @@ -34,14 +35,14 @@ private: address_space_handle_t release(); static void closeHandle(address_space_handle_t handle); -#ifdef __Fuchsia__ +#if DETECT_OS_FUCHSIA ::fidl::WireSyncClient m_device; ::fidl::WireSyncClient m_child_driver; -#else // __Fuchsia__ +#else // DETECT_OS_FUCHSIA address_space_handle_t m_handle; -#endif // !__Fuchsia__ +#endif // !DETECT_OS_FUCHSIA friend class GoldfishAddressSpaceBlock; friend class GoldfishAddressSpaceHostMemoryAllocator; @@ -69,13 +70,13 @@ private: void destroy(); GoldfishAddressSpaceBlock &operator=(const GoldfishAddressSpaceBlock &); -#ifdef __Fuchsia__ +#if DETECT_OS_FUCHSIA ::fidl::WireSyncClient* m_driver; uint32_t m_vmo; -#else // __Fuchsia__ +#else // DETECT_OS_FUCHSIA address_space_handle_t m_handle; -#endif // !__Fuchsia__ +#endif // !DETECT_OS_FUCHSIA void *m_mmaped_ptr; uint64_t m_phys_addr; diff --git a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp index b6eb8d33f47..a68b8746c63 100644 --- a/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp +++ b/src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp @@ -19,6 +19,7 @@ #include "vk_device.h" #include "vk_instance.h" #include "vk_sync_dummy.h" +#include "util/detect_os.h" uint32_t gSeqno = 0; uint32_t gNoRenderControlEnc = 0; @@ -202,7 +203,7 @@ static VkResult gfxstream_vk_physical_device_init( memset(&dispatch_table, 0, sizeof(struct vk_physical_device_dispatch_table)); vk_physical_device_dispatch_table_from_entrypoints( &dispatch_table, &gfxstream_vk_physical_device_entrypoints, false); -#if !defined(__Fuchsia__) +#if !DETECT_OS_FUCHSIA vk_physical_device_dispatch_table_from_entrypoints(&dispatch_table, &wsi_physical_device_entrypoints, false); #endif @@ -364,7 +365,7 @@ VkResult gfxstream_vk_CreateInstance(const VkInstanceCreateInfo* pCreateInfo, memset(&dispatch_table, 0, sizeof(struct vk_instance_dispatch_table)); vk_instance_dispatch_table_from_entrypoints(&dispatch_table, &gfxstream_vk_instance_entrypoints, false); -#if !defined(__Fuchsia__) +#if !DETECT_OS_FUCHSIA vk_instance_dispatch_table_from_entrypoints(&dispatch_table, &wsi_instance_entrypoints, false); #endif @@ -516,7 +517,7 @@ VkResult gfxstream_vk_CreateDevice(VkPhysicalDevice physicalDevice, memset(&dispatch_table, 0, sizeof(struct vk_device_dispatch_table)); vk_device_dispatch_table_from_entrypoints(&dispatch_table, &gfxstream_vk_device_entrypoints, false); -#if !defined(__Fuchsia__) +#if !DETECT_OS_FUCHSIA vk_device_dispatch_table_from_entrypoints(&dispatch_table, &wsi_device_entrypoints, false); #endif diff --git a/src/gfxstream/guest/vulkan_enc/Resources.cpp b/src/gfxstream/guest/vulkan_enc/Resources.cpp index 6a63039f16d..846e3b0f7ed 100644 --- a/src/gfxstream/guest/vulkan_enc/Resources.cpp +++ b/src/gfxstream/guest/vulkan_enc/Resources.cpp @@ -21,7 +21,7 @@ extern "C" { -#if DETECT_OS_ANDROID || defined(__Fuchsia__) +#if DETECT_OS_ANDROID || DETECT_OS_FUCHSIA #define SET_HWVULKAN_DISPATCH_MAGIC res->dispatch.magic = HWVULKAN_DISPATCH_MAGIC; #elif defined(__linux__) #define SET_HWVULKAN_DISPATCH_MAGIC res->loaderData.loaderMagic = ICD_LOADER_MAGIC; diff --git a/src/gfxstream/guest/vulkan_enc/Resources.h b/src/gfxstream/guest/vulkan_enc/Resources.h index a1a7cf932f1..d48dd84d40c 100644 --- a/src/gfxstream/guest/vulkan_enc/Resources.h +++ b/src/gfxstream/guest/vulkan_enc/Resources.h @@ -5,7 +5,7 @@ #pragma once #include "util/detect_os.h" -#if DETECT_OS_ANDROID || defined(__Fuchsia__) +#if DETECT_OS_ANDROID || DETECT_OS_FUCHSIA #include #elif defined(__linux__) #include @@ -39,7 +39,7 @@ struct goldfish_vk_object_list { struct goldfish_vk_object_list* next; }; -#if DETECT_OS_ANDROID || defined(__Fuchsia__) +#if DETECT_OS_ANDROID || DETECT_OS_FUCHSIA #define DECLARE_HWVULKAN_DISPATCH hwvulkan_dispatch_t dispatch; #elif defined(__linux__) #define DECLARE_HWVULKAN_DISPATCH VK_LOADER_DATA loaderData;