From 7b11561d8f63d521d4bc0e6fb005182cdfe93f82 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Mon, 6 Mar 2023 13:23:28 +0100 Subject: Replace Q_OS_WIN guards with BUILDFLAG(IS_WIN) vulkan_implementation_qt.cpp doesn't include any Qt header and Q_OS_WIN remains undefined on Windows. Also include vulkan/vulkan.h for the WIN32 vulkan macros. Pick-to: 6.5 Change-Id: I66b9f134194526c055309bb72bd3a452e2b9a2b2 Reviewed-by: Allan Sandfeld Jensen --- src/core/compositor/vulkan_implementation_qt.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/core/compositor/vulkan_implementation_qt.cpp b/src/core/compositor/vulkan_implementation_qt.cpp index 28d5d7b01..1d8187334 100644 --- a/src/core/compositor/vulkan_implementation_qt.cpp +++ b/src/core/compositor/vulkan_implementation_qt.cpp @@ -10,6 +10,8 @@ #include "gpu/vulkan/vulkan_util.h" #include "ui/gfx/gpu_fence.h" +#include + namespace gpu { VulkanImplementationQt::VulkanImplementationQt() : VulkanImplementation(false) { } @@ -25,12 +27,13 @@ bool VulkanImplementationQt::InitializeVulkanInstance(bool /*using_surface*/) auto env = base::Environment::Create(); std::string vulkan_path; - if (!env->GetVar("QT_VULKAN_LIB", &vulkan_path)) -#ifdef Q_OS_WIN + if (!env->GetVar("QT_VULKAN_LIB", &vulkan_path)) { +#if BUILDFLAG(IS_WIN) vulkan_path = "vulkan-1.dll"; #else vulkan_path = "libvulkan.so.1"; #endif + } if (!vulkan_instance_.Initialize(base::FilePath::FromUTF8Unsafe(vulkan_path), required_extensions, {})) { @@ -66,7 +69,7 @@ std::vector VulkanImplementationQt::GetRequiredDeviceExtensions() { return { VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME, -#ifdef Q_OS_WIN +#if BUILDFLAG(IS_WIN) VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, #else VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME, @@ -78,7 +81,7 @@ std::vector VulkanImplementationQt::GetOptionalDeviceExtensions() { return { VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME, -#ifdef Q_OS_WIN +#if BUILDFLAG(IS_WIN) VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, #else VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME, @@ -104,7 +107,7 @@ VulkanImplementationQt::ExportVkFenceToGpuFence(VkDevice /*vk_device*/, VkFence VkSemaphore VulkanImplementationQt::CreateExternalSemaphore(VkDevice vk_device) { return CreateExternalVkSemaphore( -#ifdef Q_OS_WIN +#if BUILDFLAG(IS_WIN) vk_device, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT); #else vk_device, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT); @@ -121,7 +124,7 @@ SemaphoreHandle VulkanImplementationQt::GetSemaphoreHandle(VkDevice vk_device, VkSemaphore vk_semaphore) { return GetVkSemaphoreHandle(vk_device, vk_semaphore, -#ifdef Q_OS_WIN +#if BUILDFLAG(IS_WIN) VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT); #else VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT); @@ -130,7 +133,7 @@ SemaphoreHandle VulkanImplementationQt::GetSemaphoreHandle(VkDevice vk_device, VkExternalMemoryHandleTypeFlagBits VulkanImplementationQt::GetExternalImageHandleType() { -#ifdef Q_OS_WIN +#ifdef BUILDFLAG(IS_WIN) return VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT; #else return VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; -- cgit v1.2.1