[Mesa-dev] [PATCH 03/22] anv/wsi: drop device from get caps

Dave Airlie airlied at gmail.com
Mon Oct 17 04:24:26 UTC 2016


From: Dave Airlie <airlied at redhat.com>

---
 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 a8ac3a1..bd20ced 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 2566fa4..2bb8ee3 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 a811d48..2563dd7 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 179c75a..fce3451 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.5.5



More information about the mesa-dev mailing list