[Mesa-dev] [PATCH 1/2] vulkan/wsi: drop can handle different gpu from the x11 interfaces

[Dave Airlie]

From: Dave Airlie <airlied at redhat.com>

Jason dropped this elsewhere, just seemed to miss here.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/amd/vulkan/radv_wsi_x11.c   | 4 ++--
 src/intel/vulkan/anv_wsi_x11.c  | 4 ++--
 src/vulkan/wsi/wsi_common_x11.c | 5 -----
 src/vulkan/wsi/wsi_common_x11.h | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/amd/vulkan/radv_wsi_x11.c b/src/amd/vulkan/radv_wsi_x11.c
index c65ac93..97d4277 100644
--- a/src/amd/vulkan/radv_wsi_x11.c
+++ b/src/amd/vulkan/radv_wsi_x11.c
@@ -46,7 +46,7 @@ VkBool32 radv_GetPhysicalDeviceXcbPresentationSupportKHR(
       &device->wsi_device,
       &device->instance->alloc,
       queueFamilyIndex,
-      device->local_fd, true,
+      device->local_fd,
       connection, visual_id);
 }
 
@@ -62,7 +62,7 @@ VkBool32 radv_GetPhysicalDeviceXlibPresentationSupportKHR(
       &device->wsi_device,
       &device->instance->alloc,
       queueFamilyIndex,
-      device->local_fd, true,
+      device->local_fd,
       XGetXCBConnection(dpy), visualID);
 }
 
diff --git a/src/intel/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c
index 2feb5f1..3042509 100644
--- a/src/intel/vulkan/anv_wsi_x11.c
+++ b/src/intel/vulkan/anv_wsi_x11.c
@@ -42,7 +42,7 @@ VkBool32 anv_GetPhysicalDeviceXcbPresentationSupportKHR(
       &device->wsi_device,
       &device->instance->alloc,
       queueFamilyIndex,
-      device->local_fd, false,
+      device->local_fd,
       connection, visual_id);
 }
 
@@ -58,7 +58,7 @@ VkBool32 anv_GetPhysicalDeviceXlibPresentationSupportKHR(
       &device->wsi_device,
       &device->instance->alloc,
       queueFamilyIndex,
-      device->local_fd, false,
+      device->local_fd,
       XGetXCBConnection(dpy), visualID);
 }
 
diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index c29e0a2..b6aaa46 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -354,7 +354,6 @@ VkBool32 wsi_get_physical_device_xcb_presentation_support(
     VkAllocationCallbacks *alloc,
     uint32_t                                    queueFamilyIndex,
     int fd,
-    bool can_handle_different_gpu,
     xcb_connection_t*                           connection,
     xcb_visualid_t                              visual_id)
 {
@@ -367,10 +366,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(connection, fd))
-         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 b335408..01f1d66 100644
--- a/src/vulkan/wsi/wsi_common_x11.h
+++ b/src/vulkan/wsi/wsi_common_x11.h
@@ -30,7 +30,6 @@ VkBool32 wsi_get_physical_device_xcb_presentation_support(
     VkAllocationCallbacks *alloc,
     uint32_t                                    queueFamilyIndex,
     int local_fd,
-    bool can_handle_different_gpu,
     xcb_connection_t*                           connection,
     xcb_visualid_t                              visual_id);
 
-- 
2.9.5