anv/wsi: remove all anv references from WSI common code

the WSI code should be now be clean for sharing.

Reviewed-by: Jason Ekstrand <[email protected]>

1 files changed, 22 insertions, 22 deletions

diff --git a/src/intel/vulkan/wsi_common_wayland.c b/src/intel/vulkan/wsi_common_wayland.c
index 636836778bc..fc6775acb79 100644
--- a/src/intel/vulkan/wsi_common_wayland.c
+++ b/src/intel/vulkan/wsi_common_wayland.c
@@ -56,7 +56,7 @@ struct wsi_wl_display {
 };
 
 struct wsi_wayland {
-   struct anv_wsi_interface                     base;
+   struct wsi_interface                     base;
 
    const VkAllocationCallbacks *alloc;
    VkPhysicalDevice physical_device;
@@ -65,7 +65,7 @@ struct wsi_wayland {
    /* Hash table of wl_display -> wsi_wl_display mappings */
    struct hash_table *                          displays;
 
-   const struct anv_wsi_callbacks *cbs;
+   const struct wsi_callbacks *cbs;
 };
 
 static void
@@ -303,7 +303,7 @@ fail:
 }
 
 static struct wsi_wl_display *
-wsi_wl_get_display(struct anv_wsi_device *wsi_device,
+wsi_wl_get_display(struct wsi_device *wsi_device,
                    struct wl_display *wl_display)
 {
    struct wsi_wayland *wsi =
@@ -338,7 +338,7 @@ wsi_wl_get_display(struct anv_wsi_device *wsi_device,
 }
 
 VkBool32
-wsi_wl_get_presentation_support(struct anv_wsi_device *wsi_device,
+wsi_wl_get_presentation_support(struct wsi_device *wsi_device,
 				struct wl_display *wl_display)
 {
    return wsi_wl_get_display(wsi_device, wl_display) != NULL;
@@ -346,7 +346,7 @@ wsi_wl_get_presentation_support(struct anv_wsi_device *wsi_device,
 
 static VkResult
 wsi_wl_surface_get_support(VkIcdSurfaceBase *surface,
-                           struct anv_wsi_device *wsi_device,
+                           struct wsi_device *wsi_device,
                            const VkAllocationCallbacks *alloc,
                            uint32_t queueFamilyIndex,
                            VkBool32* pSupported)
@@ -389,7 +389,7 @@ wsi_wl_surface_get_capabilities(VkIcdSurfaceBase *surface,
 
 static VkResult
 wsi_wl_surface_get_formats(VkIcdSurfaceBase *icd_surface,
-			   struct anv_wsi_device *wsi_device,
+			   struct wsi_device *wsi_device,
                            uint32_t* pSurfaceFormatCount,
                            VkSurfaceFormatKHR* pSurfaceFormats)
 {
@@ -436,7 +436,7 @@ wsi_wl_surface_get_present_modes(VkIcdSurfaceBase *surface,
    return VK_SUCCESS;
 }
 
-VkResult anv_create_wl_surface(const VkAllocationCallbacks *pAllocator,
+VkResult wsi_create_wl_surface(const VkAllocationCallbacks *pAllocator,
 			       const VkWaylandSurfaceCreateInfoKHR *pCreateInfo,
 			       VkSurfaceKHR *pSurface)
 {
@@ -464,7 +464,7 @@ struct wsi_wl_image {
 };
 
 struct wsi_wl_swapchain {
-   struct anv_swapchain                        base;
+   struct wsi_swapchain                        base;
 
    struct wsi_wl_display *                      display;
    struct wl_event_queue *                      queue;
@@ -482,10 +482,10 @@ struct wsi_wl_swapchain {
 };
 
 static VkResult
-wsi_wl_swapchain_get_images(struct anv_swapchain *anv_chain,
+wsi_wl_swapchain_get_images(struct wsi_swapchain *wsi_chain,
                             uint32_t *pCount, VkImage *pSwapchainImages)
 {
-   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)anv_chain;
+   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
 
    if (pSwapchainImages == NULL) {
       *pCount = chain->image_count;
@@ -502,12 +502,12 @@ wsi_wl_swapchain_get_images(struct anv_swapchain *anv_chain,
 }
 
 static VkResult
-wsi_wl_swapchain_acquire_next_image(struct anv_swapchain *anv_chain,
+wsi_wl_swapchain_acquire_next_image(struct wsi_swapchain *wsi_chain,
                                     uint64_t timeout,
                                     VkSemaphore semaphore,
                                     uint32_t *image_index)
 {
-   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)anv_chain;
+   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
 
    int ret = wl_display_dispatch_queue_pending(chain->display->display,
                                                chain->queue);
@@ -553,10 +553,10 @@ static const struct wl_callback_listener frame_listener = {
 };
 
 static VkResult
-wsi_wl_swapchain_queue_present(struct anv_swapchain *anv_chain,
+wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
                                uint32_t image_index)
 {
-   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)anv_chain;
+   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
 
    if (chain->present_mode == VK_PRESENT_MODE_FIFO_KHR) {
       while (!chain->fifo_ready) {
@@ -646,10 +646,10 @@ wsi_wl_image_init(struct wsi_wl_swapchain *chain,
 }
 
 static VkResult
-wsi_wl_swapchain_destroy(struct anv_swapchain *anv_chain,
+wsi_wl_swapchain_destroy(struct wsi_swapchain *wsi_chain,
                          const VkAllocationCallbacks *pAllocator)
 {
-   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)anv_chain;
+   struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
 
    for (uint32_t i = 0; i < chain->image_count; i++) {
       if (chain->images[i].buffer)
@@ -666,11 +666,11 @@ wsi_wl_swapchain_destroy(struct anv_swapchain *anv_chain,
 static VkResult
 wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
                                 VkDevice device,
-                                struct anv_wsi_device *wsi_device,
+                                struct wsi_device *wsi_device,
                                 const VkSwapchainCreateInfoKHR* pCreateInfo,
                                 const VkAllocationCallbacks* pAllocator,
-                                const struct anv_wsi_image_fns *image_fns,
-                                struct anv_swapchain **swapchain_out)
+                                const struct wsi_image_fns *image_fns,
+                                struct wsi_swapchain **swapchain_out)
 {
    VkIcdSurfaceWayland *surface = (VkIcdSurfaceWayland *)icd_surface;
    struct wsi_wl_swapchain *chain;
@@ -752,10 +752,10 @@ fail:
 }
 
 VkResult
-anv_wl_init_wsi(struct anv_wsi_device *wsi_device,
+wsi_wl_init_wsi(struct wsi_device *wsi_device,
                 const VkAllocationCallbacks *alloc,
                 VkPhysicalDevice physical_device,
-                const struct anv_wsi_callbacks *cbs)
+                const struct wsi_callbacks *cbs)
 {
    struct wsi_wayland *wsi;
    VkResult result;
@@ -811,7 +811,7 @@ fail:
 }
 
 void
-anv_wl_finish_wsi(struct anv_wsi_device *wsi_device,
+wsi_wl_finish_wsi(struct wsi_device *wsi_device,
                   const VkAllocationCallbacks *alloc)
 {
    struct wsi_wayland *wsi =