anv/wsi: remove device from get_support interface
replace with wsi_device and allocator. Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
@@ -81,7 +81,9 @@ VkResult anv_GetPhysicalDeviceSurfaceSupportKHR(
|
||||
ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface);
|
||||
struct anv_wsi_interface *iface = device->wsi_device.wsi[surface->platform];
|
||||
|
||||
return iface->get_support(surface, device, queueFamilyIndex, pSupported);
|
||||
return iface->get_support(surface, &device->wsi_device,
|
||||
&device->instance->alloc,
|
||||
queueFamilyIndex, pSupported);
|
||||
}
|
||||
|
||||
VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
|
||||
|
@@ -30,7 +30,8 @@ struct anv_swapchain;
|
||||
|
||||
struct anv_wsi_interface {
|
||||
VkResult (*get_support)(VkIcdSurfaceBase *surface,
|
||||
struct anv_physical_device *device,
|
||||
struct anv_wsi_device *wsi_device,
|
||||
const VkAllocationCallbacks *alloc,
|
||||
uint32_t queueFamilyIndex,
|
||||
VkBool32* pSupported);
|
||||
VkResult (*get_capabilities)(VkIcdSurfaceBase *surface,
|
||||
|
@@ -332,7 +332,8 @@ VkBool32 anv_GetPhysicalDeviceWaylandPresentationSupportKHR(
|
||||
|
||||
static VkResult
|
||||
wsi_wl_surface_get_support(VkIcdSurfaceBase *surface,
|
||||
struct anv_physical_device *device,
|
||||
struct anv_wsi_device *wsi_device,
|
||||
const VkAllocationCallbacks *alloc,
|
||||
uint32_t queueFamilyIndex,
|
||||
VkBool32* pSupported)
|
||||
{
|
||||
|
@@ -306,7 +306,8 @@ x11_surface_get_window(VkIcdSurfaceBase *icd_surface)
|
||||
|
||||
static VkResult
|
||||
x11_surface_get_support(VkIcdSurfaceBase *icd_surface,
|
||||
struct anv_physical_device *device,
|
||||
struct anv_wsi_device *wsi_device,
|
||||
const VkAllocationCallbacks *alloc,
|
||||
uint32_t queueFamilyIndex,
|
||||
VkBool32* pSupported)
|
||||
{
|
||||
@@ -314,7 +315,7 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface,
|
||||
xcb_window_t window = x11_surface_get_window(icd_surface);
|
||||
|
||||
struct wsi_x11_connection *wsi_conn =
|
||||
wsi_x11_get_connection(&device->wsi_device, &device->instance->alloc, conn);
|
||||
wsi_x11_get_connection(wsi_device, alloc, conn);
|
||||
if (!wsi_conn)
|
||||
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
|
||||
|
||||
|
Reference in New Issue
Block a user