radv/anv/wsi: drop unneeded parameter

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c
index c30112ab7de6f944809bc0b516dba33e9a306723..1a0171d8c9f6eb5f586d61432adbbce42e1b6487 100644 (file)
--- 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 d624ab2b0fb1abb2069d88815058433e5d5f3500..04fd0f67ed15decc7e5efd67bff8bf36ccd3eb6d 100644 (file)
--- 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 675c8a2a4fd3b5abda5f7e37cc759c9be7318051..06af89469c32253c891f5f0c6224d772c462b8eb 100644 (file)
--- 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 cbb5b3038fef29f9ee29285c3344a7589bc77cf6..2da8195235e99915656490043094bac3f770c878 100644 (file)
--- 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 e15d1a3e073cc138b65e82dec6f43dabdbecdac2..fc35572b244cebd88aacabf00f99bb3531083e64 100644 (file)
--- 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 02be86dada541789002c64f67b3753078802bbba..f502677dc343fec0dc5292f65fd41001e03281a5 100644 (file)
--- 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 ad3a803806990f04eb5b2d377a0e087611a37a41..35de4280bd276fb7be496b9ccfb9f840cf7d5eef 100644 (file)
--- 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 3b7ecf063811697840641bbe193d2720f95fee6f..5d025c5e906c77941e12189e921117d3dd9d7a0c 100644 (file)
--- 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;