From 738f0f789bfcd6703327492dbc4297ca076e7862 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 25 Oct 2018 11:15:38 +0100 Subject: [PATCH] vulkan: drop always-true param Signed-off-by: Eric Engestrom Reviewed-by: Jason Ekstrand --- src/amd/vulkan/radv_wsi_x11.c | 2 -- src/intel/vulkan/anv_wsi_x11.c | 2 -- src/vulkan/wsi/wsi_common_x11.c | 5 ----- src/vulkan/wsi/wsi_common_x11.h | 1 - 4 files changed, 10 deletions(-) diff --git a/src/amd/vulkan/radv_wsi_x11.c b/src/amd/vulkan/radv_wsi_x11.c index f3ebc791e2d..acad74d3cf2 100644 --- a/src/amd/vulkan/radv_wsi_x11.c +++ b/src/amd/vulkan/radv_wsi_x11.c @@ -45,7 +45,6 @@ VkBool32 radv_GetPhysicalDeviceXcbPresentationSupportKHR( return wsi_get_physical_device_xcb_presentation_support( &device->wsi_device, queueFamilyIndex, - true, connection, visual_id); } @@ -60,7 +59,6 @@ VkBool32 radv_GetPhysicalDeviceXlibPresentationSupportKHR( return wsi_get_physical_device_xcb_presentation_support( &device->wsi_device, queueFamilyIndex, - true, XGetXCBConnection(dpy), visualID); } diff --git a/src/intel/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c index 7a27ceab64f..9a50b17f999 100644 --- a/src/intel/vulkan/anv_wsi_x11.c +++ b/src/intel/vulkan/anv_wsi_x11.c @@ -41,7 +41,6 @@ VkBool32 anv_GetPhysicalDeviceXcbPresentationSupportKHR( return wsi_get_physical_device_xcb_presentation_support( &device->wsi_device, queueFamilyIndex, - true, connection, visual_id); } @@ -56,7 +55,6 @@ VkBool32 anv_GetPhysicalDeviceXlibPresentationSupportKHR( return wsi_get_physical_device_xcb_presentation_support( &device->wsi_device, queueFamilyIndex, - true, XGetXCBConnection(dpy), visualID); } diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index 6eb72827eda..c740726fe54 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -375,7 +375,6 @@ visual_has_alpha(xcb_visualtype_t *visual, unsigned depth) VkBool32 wsi_get_physical_device_xcb_presentation_support( struct wsi_device *wsi_device, uint32_t queueFamilyIndex, - bool can_handle_different_gpu, xcb_connection_t* connection, xcb_visualid_t visual_id) { @@ -388,10 +387,6 @@ VkBool32 wsi_get_physical_device_xcb_presentation_support( if (!wsi_x11_check_for_dri3(wsi_conn)) return false; - if (!can_handle_different_gpu) - if (!wsi_x11_check_dri3_compatible(wsi_device, connection)) - return false; - unsigned visual_depth; if (!connection_get_visualtype(connection, visual_id, &visual_depth)) return false; diff --git a/src/vulkan/wsi/wsi_common_x11.h b/src/vulkan/wsi/wsi_common_x11.h index 99b1bcdc6fd..e4b1e94a8c8 100644 --- a/src/vulkan/wsi/wsi_common_x11.h +++ b/src/vulkan/wsi/wsi_common_x11.h @@ -28,7 +28,6 @@ VkBool32 wsi_get_physical_device_xcb_presentation_support( struct wsi_device *wsi_device, uint32_t queueFamilyIndex, - bool can_handle_different_gpu, xcb_connection_t* connection, xcb_visualid_t visual_id); -- 2.11.0