From e9cf7c4460588eec68074c477bf3c7add6d21da7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 13 Oct 2016 05:27:56 +0100 Subject: [PATCH] anv/wsi: drop device from get caps Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_wsi.c | 2 +- src/intel/vulkan/anv_wsi.h | 1 - src/intel/vulkan/anv_wsi_wayland.c | 1 - src/intel/vulkan/anv_wsi_x11.c | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index a8ac3a1c3cc..bd20cedd132 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -93,7 +93,7 @@ VkResult anv_GetPhysicalDeviceSurfaceCapabilitiesKHR( ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface); struct anv_wsi_interface *iface = device->wsi[surface->platform]; - return iface->get_capabilities(surface, device, pSurfaceCapabilities); + return iface->get_capabilities(surface, pSurfaceCapabilities); } VkResult anv_GetPhysicalDeviceSurfaceFormatsKHR( diff --git a/src/intel/vulkan/anv_wsi.h b/src/intel/vulkan/anv_wsi.h index 2566fa4d3d6..2bb8ee3be7f 100644 --- a/src/intel/vulkan/anv_wsi.h +++ b/src/intel/vulkan/anv_wsi.h @@ -34,7 +34,6 @@ struct anv_wsi_interface { uint32_t queueFamilyIndex, VkBool32* pSupported); VkResult (*get_capabilities)(VkIcdSurfaceBase *surface, - struct anv_physical_device *device, VkSurfaceCapabilitiesKHR* pSurfaceCapabilities); VkResult (*get_formats)(VkIcdSurfaceBase *surface, struct anv_physical_device *device, diff --git a/src/intel/vulkan/anv_wsi_wayland.c b/src/intel/vulkan/anv_wsi_wayland.c index a811d485323..2563dd75692 100644 --- a/src/intel/vulkan/anv_wsi_wayland.c +++ b/src/intel/vulkan/anv_wsi_wayland.c @@ -348,7 +348,6 @@ static const VkPresentModeKHR present_modes[] = { static VkResult wsi_wl_surface_get_capabilities(VkIcdSurfaceBase *surface, - struct anv_physical_device *device, VkSurfaceCapabilitiesKHR* caps) { caps->minImageCount = MIN_NUM_IMAGES; diff --git a/src/intel/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c index 179c75ace1f..fce3451481d 100644 --- a/src/intel/vulkan/anv_wsi_x11.c +++ b/src/intel/vulkan/anv_wsi_x11.c @@ -325,7 +325,6 @@ x11_surface_get_support(VkIcdSurfaceBase *icd_surface, static VkResult x11_surface_get_capabilities(VkIcdSurfaceBase *icd_surface, - struct anv_physical_device *device, VkSurfaceCapabilitiesKHR *caps) { xcb_connection_t *conn = x11_surface_get_connection(icd_surface); -- 2.30.2