vk/wsi: Move to a clallback system for the entire WSI implementation

We do this for two reasons: First, because it allows us to simplify WSI and
compiling in/out support for a particular platform is as simple as calling
or not calling the platform-specific init function.  Second, the
implementation gives us a place for a given chunk of the WSI to stash
stuff in the instance.

1 files changed, 18 insertions, 7 deletions

diff --git a/src/vulkan/anv_wsi.h b/src/vulkan/anv_wsi.h
index 3a5fba13a56..3ee3fcee56d 100644
--- a/src/vulkan/anv_wsi.h
+++ b/src/vulkan/anv_wsi.h
@@ -42,10 +42,21 @@ struct anv_swap_chain {
 
 ANV_DEFINE_NONDISP_HANDLE_CASTS(anv_swap_chain, VkSwapChainWSI)
 
-VkResult anv_x11_get_surface_info(struct anv_device *device,
-                                  VkSurfaceDescriptionWindowWSI *window,
-                                  VkSurfaceInfoTypeWSI infoType,
-                                  size_t* pDataSize, void* pData);
-VkResult anv_x11_create_swap_chain(struct anv_device *device,
-                                   const VkSwapChainCreateInfoWSI *pCreateInfo,
-                                   struct anv_swap_chain **swap_chain);
+struct anv_wsi_implementation {
+   VkResult (*get_window_supported)(struct anv_wsi_implementation *impl,
+                                    struct anv_physical_device *physical_device,
+                                    const VkSurfaceDescriptionWindowWSI *window,
+                                    VkBool32 *pSupported);
+   VkResult (*get_surface_info)(struct anv_wsi_implementation *impl,
+                                struct anv_device *device,
+                                VkSurfaceDescriptionWindowWSI *window,
+                                VkSurfaceInfoTypeWSI infoType,
+                                size_t* pDataSize, void* pData);
+   VkResult (*create_swap_chain)(struct anv_wsi_implementation *impl,
+                                 struct anv_device *device,
+                                 const VkSwapChainCreateInfoWSI *pCreateInfo,
+                                 struct anv_swap_chain **swap_chain);
+};
+
+VkResult anv_x11_init_wsi(struct anv_instance *instance);
+void anv_x11_finish_wsi(struct anv_instance *instance);