commit 41901f90b77520eefe77a92d5d06b163afede5f1
author Kévin Petit <kevin.petit@arm.com> Thu Jan 28 20:15:51 2021 +0000
committer Lenny Komow <lenny@lunarg.com> Thu Jan 28 17:19:33 2021 -0700
tree 9ff9286c43cb8ba815a84e5a4516b304cb8cc7f3
parent aed40d52837dba3850a27c61529de6fa25979d19

loader: Fix Android build

- Add missing prototype
- Fix incorrect parameter handling

Signed-off-by: Kévin Petit <kevin.petit@arm.com>

loader/wsi.c

diff --git a/loader/wsi.c b/loader/wsi.c
index 523f16a..756225a 100644
--- a/loader/wsi.c
+++ b/loader/wsi.c
@@ -1095,19 +1095,19 @@
 // Functions for the VK_KHR_android_surface extension:
 
 // This is the trampoline entrypoint for CreateAndroidSurfaceKHR
-LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(VkInstance instance, ANativeWindow *window,
+LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR *pCreateInfo,
                                                                        const VkAllocationCallbacks *pAllocator,
                                                                        VkSurfaceKHR *pSurface) {
     const VkLayerInstanceDispatchTable *disp;
     disp = loader_get_instance_layer_dispatch(instance);
     VkResult res;
 
-    res = disp->CreateAndroidSurfaceKHR(instance, window, pAllocator, pSurface);
+    res = disp->CreateAndroidSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
     return res;
 }
 
 // This is the instance chain terminator function for CreateAndroidSurfaceKHR
-VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateAndroidSurfaceKHR(VkInstance instance, Window window,
+VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR *pCreateInfo,
                                                                   const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) {
     // First, check to ensure the appropriate extension was enabled:
     struct loader_instance *ptr_instance = loader_get_instance(instance);
@@ -1125,7 +1125,7 @@
     }
 
     pIcdSurface->base.platform = VK_ICD_WSI_PLATFORM_ANDROID;
-    pIcdSurface->window = window;
+    pIcdSurface->window = pCreateInfo->window;
 
     *pSurface = (VkSurfaceKHR)pIcdSurface;
 

loader/wsi.h

diff --git a/loader/wsi.h b/loader/wsi.h
index c9f4654..cad0d45 100644
--- a/loader/wsi.h
+++ b/loader/wsi.h
@@ -207,6 +207,11 @@
                                                                 const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface);
 #endif
 
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateAndroidSurfaceKHR(VkInstance instance, const VkAndroidSurfaceCreateInfoKHR *pCreateInfo,
+                                                                  const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface);
+#endif
+
 VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceSurfaceCapabilities2KHR(
     VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo,
     VkSurfaceCapabilities2KHR *pSurfaceCapabilities);