Module: Mesa Branch: main Commit: 2ea04ef69bba7b7fddf2f44ff62a24979bcb9c2b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ea04ef69bba7b7fddf2f44ff62a24979bcb9c2b
Author: Jesse Natalie <[email protected]> Date: Thu Dec 14 16:32:02 2023 -0800 vulkan/wsi: Convert bit tests to bool with != 0 Otherwise the bool result could be some value other than 0 or 1. Fixes: d7938de8 ("vulkan/wsi: don't support present with queues where blit is unsupported") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26706> --- src/vulkan/wsi/wsi_common.c | 2 +- src/vulkan/wsi/wsi_common_win32.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c index 2b82f44e87d..97c26d6b08a 100644 --- a/src/vulkan/wsi/wsi_common.c +++ b/src/vulkan/wsi/wsi_common.c @@ -782,7 +782,7 @@ wsi_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, VkResult res = iface->get_support(surface, wsi_device, queueFamilyIndex, pSupported); if (res == VK_SUCCESS) { - bool blit = wsi_device->queue_supports_blit & BITFIELD64_BIT(queueFamilyIndex); + bool blit = (wsi_device->queue_supports_blit & BITFIELD64_BIT(queueFamilyIndex)) != 0; *pSupported = (bool)*pSupported && blit; } diff --git a/src/vulkan/wsi/wsi_common_win32.cpp b/src/vulkan/wsi/wsi_common_win32.cpp index acc4136bda5..e614dae9782 100644 --- a/src/vulkan/wsi/wsi_common_win32.cpp +++ b/src/vulkan/wsi/wsi_common_win32.cpp @@ -114,7 +114,7 @@ wsi_GetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice physicalDevice { VK_FROM_HANDLE(vk_physical_device, pdevice, physicalDevice); struct wsi_device *wsi_device = pdevice->wsi_device; - return wsi_device->queue_supports_blit & BITFIELD64_BIT(queueFamilyIndex); + return (wsi_device->queue_supports_blit & BITFIELD64_BIT(queueFamilyIndex)) != 0; } VKAPI_ATTR VkResult VKAPI_CALL
