[Mesa-dev] [PATCH 01/22] radv/anv/wsi: drop uneeded parameter

[Dave Airlie]

From: Dave Airlie <airlied at redhat.com>

---
 src/amd/vulkan/radv_wsi.c          | 2 +-
 src/amd/vulkan/radv_wsi.h          | 1 -
 src/amd/vulkan/radv_wsi_wayland.c  | 1 -
 src/amd/vulkan/radv_wsi_x11.c      | 1 -
 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 -
 8 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c
index c30112a..1a0171d 100644
--- a/src/amd/vulkan/radv_wsi.c
+++ b/src/amd/vulkan/radv_wsi.c
@@ -224,7 +224,7 @@ VkResult radv_QueuePresentKHR(
 
 		radv_QueueSubmit(_queue, 0, NULL, swapchain->fences[0]);
 
-		result = swapchain->queue_present(swapchain, queue,
+		result = swapchain->queue_present(swapchain,
 						  pPresentInfo->pImageIndices[i]);
 		/* TODO: What if one of them returns OUT_OF_DATE? */
 		if (result != VK_SUCCESS)
diff --git a/src/amd/vulkan/radv_wsi.h b/src/amd/vulkan/radv_wsi.h
index d624ab2..04fd0f6 100644
--- a/src/amd/vulkan/radv_wsi.h
+++ b/src/amd/vulkan/radv_wsi.h
@@ -67,7 +67,6 @@ struct radv_swapchain {
 				       uint64_t timeout, VkSemaphore semaphore,
 				       uint32_t *image_index);
 	VkResult (*queue_present)(struct radv_swapchain *swap_chain,
-				  struct radv_queue *queue,
 				  uint32_t image_index);
 };
 
diff --git a/src/amd/vulkan/radv_wsi_wayland.c b/src/amd/vulkan/radv_wsi_wayland.c
index 675c8a2..06af894 100644
--- a/src/amd/vulkan/radv_wsi_wayland.c
+++ b/src/amd/vulkan/radv_wsi_wayland.c
@@ -552,7 +552,6 @@ static const struct wl_callback_listener frame_listener = {
 
 static VkResult
 wsi_wl_swapchain_queue_present(struct radv_swapchain *radv_chain,
-                               struct radv_queue *queue,
                                uint32_t image_index)
 {
 	struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)radv_chain;
diff --git a/src/amd/vulkan/radv_wsi_x11.c b/src/amd/vulkan/radv_wsi_x11.c
index cbb5b30..2da8195 100644
--- a/src/amd/vulkan/radv_wsi_x11.c
+++ b/src/amd/vulkan/radv_wsi_x11.c
@@ -599,7 +599,6 @@ x11_acquire_next_image(struct radv_swapchain *radv_chain,
 
 static VkResult
 x11_queue_present(struct radv_swapchain *radv_chain,
-                  struct radv_queue *queue,
                   uint32_t image_index)
 {
 	struct x11_swapchain *chain = (struct x11_swapchain *)radv_chain;
diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
index e15d1a3..fc35572 100644
--- a/src/intel/vulkan/anv_wsi.c
+++ b/src/intel/vulkan/anv_wsi.c
@@ -222,7 +222,7 @@ VkResult anv_QueuePresentKHR(
 
       anv_QueueSubmit(_queue, 0, NULL, swapchain->fences[0]);
 
-      result = swapchain->queue_present(swapchain, queue,
+      result = swapchain->queue_present(swapchain,
                                         pPresentInfo->pImageIndices[i]);
       /* TODO: What if one of them returns OUT_OF_DATE? */
       if (result != VK_SUCCESS)
diff --git a/src/intel/vulkan/anv_wsi.h b/src/intel/vulkan/anv_wsi.h
index 02be86d..f502677 100644
--- a/src/intel/vulkan/anv_wsi.h
+++ b/src/intel/vulkan/anv_wsi.h
@@ -66,7 +66,6 @@ struct anv_swapchain {
                                   uint64_t timeout, VkSemaphore semaphore,
                                   uint32_t *image_index);
    VkResult (*queue_present)(struct anv_swapchain *swap_chain,
-                             struct anv_queue *queue,
                              uint32_t image_index);
 };
 
diff --git a/src/intel/vulkan/anv_wsi_wayland.c b/src/intel/vulkan/anv_wsi_wayland.c
index ad3a803..35de428 100644
--- a/src/intel/vulkan/anv_wsi_wayland.c
+++ b/src/intel/vulkan/anv_wsi_wayland.c
@@ -554,7 +554,6 @@ static const struct wl_callback_listener frame_listener = {
 
 static VkResult
 wsi_wl_swapchain_queue_present(struct anv_swapchain *anv_chain,
-                               struct anv_queue *queue,
                                uint32_t image_index)
 {
    struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)anv_chain;
diff --git a/src/intel/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c
index 3b7ecf0..5d025c5 100644
--- a/src/intel/vulkan/anv_wsi_x11.c
+++ b/src/intel/vulkan/anv_wsi_x11.c
@@ -594,7 +594,6 @@ x11_acquire_next_image(struct anv_swapchain *anv_chain,
 
 static VkResult
 x11_queue_present(struct anv_swapchain *anv_chain,
-                  struct anv_queue *queue,
                   uint32_t image_index)
 {
    struct x11_swapchain *chain = (struct x11_swapchain *)anv_chain;
-- 
2.5.5