vulkan/wsi: Drop the can_handle_different_gpu parameter from get_support
Both anv and radv can handle prime now. Reviewed-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Chad Versace <chadversary@chromium.org>
This commit is contained in:
parent
3131fd9dec
commit
82931dc007
|
@ -114,7 +114,7 @@ VkResult radv_GetPhysicalDeviceSurfaceSupportKHR(
|
||||||
|
|
||||||
return iface->get_support(surface, &device->wsi_device,
|
return iface->get_support(surface, &device->wsi_device,
|
||||||
&device->instance->alloc,
|
&device->instance->alloc,
|
||||||
queueFamilyIndex, device->local_fd, true, pSupported);
|
queueFamilyIndex, device->local_fd, pSupported);
|
||||||
}
|
}
|
||||||
|
|
||||||
VkResult radv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
|
VkResult radv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
|
||||||
|
|
|
@ -116,7 +116,7 @@ VkResult anv_GetPhysicalDeviceSurfaceSupportKHR(
|
||||||
|
|
||||||
return iface->get_support(surface, &device->wsi_device,
|
return iface->get_support(surface, &device->wsi_device,
|
||||||
&device->instance->alloc,
|
&device->instance->alloc,
|
||||||
queueFamilyIndex, device->local_fd, true, pSupported);
|
queueFamilyIndex, device->local_fd, pSupported);
|
||||||
}
|
}
|
||||||
|
|
||||||
VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
|
VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
|
||||||
|
|
|
@ -57,7 +57,6 @@ struct wsi_interface {
|
||||||
const VkAllocationCallbacks *alloc,
|
const VkAllocationCallbacks *alloc,
|
||||||
uint32_t queueFamilyIndex,
|
uint32_t queueFamilyIndex,
|
||||||
int local_fd,
|
int local_fd,
|
||||||
bool can_handle_different_gpu,
|
|
||||||
VkBool32* pSupported);
|
VkBool32* pSupported);
|
||||||
VkResult (*get_capabilities)(VkIcdSurfaceBase *surface,
|
VkResult (*get_capabilities)(VkIcdSurfaceBase *surface,
|
||||||
VkSurfaceCapabilitiesKHR* pSurfaceCapabilities);
|
VkSurfaceCapabilitiesKHR* pSurfaceCapabilities);
|
||||||
|
|
|
@ -400,7 +400,6 @@ wsi_wl_surface_get_support(VkIcdSurfaceBase *surface,
|
||||||
const VkAllocationCallbacks *alloc,
|
const VkAllocationCallbacks *alloc,
|
||||||
uint32_t queueFamilyIndex,
|
uint32_t queueFamilyIndex,
|
||||||
int local_fd,
|
int local_fd,
|
||||||
bool can_handle_different_gpu,
|
|
||||||
VkBool32* pSupported)
|
VkBool32* pSupported)
|
||||||
{
|
{
|
||||||
*pSupported = true;
|
*pSupported = true;
|
||||||
|
|
|
@ -405,7 +405,6 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface,
|
||||||
const VkAllocationCallbacks *alloc,
|
const VkAllocationCallbacks *alloc,
|
||||||
uint32_t queueFamilyIndex,
|
uint32_t queueFamilyIndex,
|
||||||
int local_fd,
|
int local_fd,
|
||||||
bool can_handle_different_gpu,
|
|
||||||
VkBool32* pSupported)
|
VkBool32* pSupported)
|
||||||
{
|
{
|
||||||
xcb_connection_t *conn = x11_surface_get_connection(icd_surface);
|
xcb_connection_t *conn = x11_surface_get_connection(icd_surface);
|
||||||
|
@ -421,10 +420,6 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface,
|
||||||
return VK_SUCCESS;
|
return VK_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!can_handle_different_gpu)
|
|
||||||
if (!wsi_x11_check_dri3_compatible(conn, local_fd))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
unsigned visual_depth;
|
unsigned visual_depth;
|
||||||
if (!get_visualtype_for_window(conn, window, &visual_depth)) {
|
if (!get_visualtype_for_window(conn, window, &visual_depth)) {
|
||||||
*pSupported = false;
|
*pSupported = false;
|
||||||
|
|
Loading…
Reference in New Issue