Module: wine Branch: master Commit: 72c228a3ab6913930d19b926a971cb93345113be URL: https://gitlab.winehq.org/wine/wine/-/commit/72c228a3ab6913930d19b926a971cb9...
Author: Rémi Bernon rbernon@codeweavers.com Date: Fri Feb 23 10:23:11 2024 +0100
winevulkan: Remove unnecessary WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT quirk.
---
dlls/winevulkan/vulkan.c | 4 +--- dlls/winevulkan/vulkan_loader.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index de7f7282c4e..01d2a0c20a0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -893,8 +893,6 @@ VkResult wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; }
- object->quirks |= WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT; - client_instance->base.unix_handle = (uintptr_t)object; *instance = client_instance; TRACE("Created instance %p, host_instance %p.\n", object, object->host_instance); @@ -1866,7 +1864,7 @@ static void adjust_surface_capabilities(struct wine_instance *instance, struct w * https://vulkan.gpuinfo.org/displayreport.php?id=9122#surface * https://vulkan.gpuinfo.org/displayreport.php?id=9121#surface */ - if ((instance->quirks & WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT) && !capabilities->maxImageCount) + if (!capabilities->maxImageCount) capabilities->maxImageCount = max(capabilities->minImageCount, 16);
/* Update the image extents to match what the Win32 WSI would provide. */ diff --git a/dlls/winevulkan/vulkan_loader.h b/dlls/winevulkan/vulkan_loader.h index 6f62201f503..710c07772fc 100644 --- a/dlls/winevulkan/vulkan_loader.h +++ b/dlls/winevulkan/vulkan_loader.h @@ -39,7 +39,6 @@ #define VULKAN_ICD_MAGIC_VALUE 0x01CDC0DE
#define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 -#define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002
/* Base 'class' for our Vulkan dispatchable objects such as VkDevice and VkInstance. * This structure MUST be the first element of a dispatchable object as the ICD