diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-03-06 13:23:28 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-03-16 14:42:36 +0100 |
| commit | 7b11561d8f63d521d4bc0e6fb005182cdfe93f82 (patch) | |
| tree | 425259e68063e5ef81377f5870389bec8c95785a /src | |
| parent | 398716006176906c2128e47d6fca9dda029692c2 (diff) | |
| download | qtwebengine-7b11561d8f63d521d4bc0e6fb005182cdfe93f82.tar.gz | |
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 <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/compositor/vulkan_implementation_qt.cpp | 17 |
1 files 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 <vulkan/vulkan.h> + 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<const char *> 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<const char *> 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; |