From 82931dc007bf6e485a4add7a875133b8ed48de55 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 16 Nov 2017 12:05:35 -0800 Subject: [PATCH] vulkan/wsi: Drop the can_handle_different_gpu parameter from get_support Both anv and radv can handle prime now. Reviewed-by: Dave Airlie Reviewed-by: Chad Versace --- src/amd/vulkan/radv_wsi.c | 2 +- src/intel/vulkan/anv_wsi.c | 2 +- src/vulkan/wsi/wsi_common.h | 1 - src/vulkan/wsi/wsi_common_wayland.c | 1 - src/vulkan/wsi/wsi_common_x11.c | 5 ----- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index d864a9f613f..14431f471f1 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -114,7 +114,7 @@ VkResult radv_GetPhysicalDeviceSurfaceSupportKHR( return iface->get_support(surface, &device->wsi_device, &device->instance->alloc, - queueFamilyIndex, device->local_fd, true, pSupported); + queueFamilyIndex, device->local_fd, pSupported); } VkResult radv_GetPhysicalDeviceSurfaceCapabilitiesKHR( diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index 6f5aaf6b704..5c09d3b9837 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -116,7 +116,7 @@ VkResult anv_GetPhysicalDeviceSurfaceSupportKHR( return iface->get_support(surface, &device->wsi_device, &device->instance->alloc, - queueFamilyIndex, device->local_fd, true, pSupported); + queueFamilyIndex, device->local_fd, pSupported); } VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR( diff --git a/src/vulkan/wsi/wsi_common.h b/src/vulkan/wsi/wsi_common.h index d42e5e44531..32a7e731321 100644 --- a/src/vulkan/wsi/wsi_common.h +++ b/src/vulkan/wsi/wsi_common.h @@ -57,7 +57,6 @@ struct wsi_interface { const VkAllocationCallbacks *alloc, uint32_t queueFamilyIndex, int local_fd, - bool can_handle_different_gpu, VkBool32* pSupported); VkResult (*get_capabilities)(VkIcdSurfaceBase *surface, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities); diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index fed2e8f912e..3e2ff49dc17 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -400,7 +400,6 @@ wsi_wl_surface_get_support(VkIcdSurfaceBase *surface, const VkAllocationCallbacks *alloc, uint32_t queueFamilyIndex, int local_fd, - bool can_handle_different_gpu, VkBool32* pSupported) { *pSupported = true; diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index 04ce810e561..c29e0a2d30d 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -405,7 +405,6 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface, const VkAllocationCallbacks *alloc, uint32_t queueFamilyIndex, int local_fd, - bool can_handle_different_gpu, VkBool32* pSupported) { xcb_connection_t *conn = x11_surface_get_connection(icd_surface); @@ -421,10 +420,6 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface, return VK_SUCCESS; } - if (!can_handle_different_gpu) - if (!wsi_x11_check_dri3_compatible(conn, local_fd)) - return false; - unsigned visual_depth; if (!get_visualtype_for_window(conn, window, &visual_depth)) { *pSupported = false;