anv/wsi: drop device from get format

Just use the wsi_device instead.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Dave Airlie 2016-10-13 05:32:41 +01:00
parent 467d161e6a
commit c264c272a5
4 changed files with 5 additions and 5 deletions

View File

@ -108,7 +108,7 @@ VkResult anv_GetPhysicalDeviceSurfaceFormatsKHR(
ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface);
struct anv_wsi_interface *iface = device->wsi_device.wsi[surface->platform];
return iface->get_formats(surface, device, pSurfaceFormatCount,
return iface->get_formats(surface, &device->wsi_device, pSurfaceFormatCount,
pSurfaceFormats);
}

View File

@ -37,7 +37,7 @@ struct anv_wsi_interface {
VkResult (*get_capabilities)(VkIcdSurfaceBase *surface,
VkSurfaceCapabilitiesKHR* pSurfaceCapabilities);
VkResult (*get_formats)(VkIcdSurfaceBase *surface,
struct anv_physical_device *device,
struct anv_wsi_device *wsi_device,
uint32_t* pSurfaceFormatCount,
VkSurfaceFormatKHR* pSurfaceFormats);
VkResult (*get_present_modes)(VkIcdSurfaceBase *surface,

View File

@ -375,13 +375,13 @@ wsi_wl_surface_get_capabilities(VkIcdSurfaceBase *surface,
static VkResult
wsi_wl_surface_get_formats(VkIcdSurfaceBase *icd_surface,
struct anv_physical_device *device,
struct anv_wsi_device *wsi_device,
uint32_t* pSurfaceFormatCount,
VkSurfaceFormatKHR* pSurfaceFormats)
{
VkIcdSurfaceWayland *surface = (VkIcdSurfaceWayland *)icd_surface;
struct wsi_wl_display *display =
wsi_wl_get_display(&device->wsi_device, surface->display);
wsi_wl_get_display(wsi_device, surface->display);
uint32_t count = u_vector_length(&display->formats);

View File

@ -401,7 +401,7 @@ x11_surface_get_capabilities(VkIcdSurfaceBase *icd_surface,
static VkResult
x11_surface_get_formats(VkIcdSurfaceBase *surface,
struct anv_physical_device *device,
struct anv_wsi_device *wsi_device,
uint32_t *pSurfaceFormatCount,
VkSurfaceFormatKHR *pSurfaceFormats)
{