Fix the build error on Android
authorJiayuan Ren <renjiayuan1314@gmail.com>
Fri, 15 Feb 2019 00:11:59 +0000 (16:11 -0800)
committerjeremyk-lunarg <jeremyk@lunarg.com>
Mon, 18 Feb 2019 21:08:39 +0000 (14:08 -0700)
Currently, the vulkaninfo is not supported on Android.
But someone might use the vulkaninfo with their own makefiles
crossing all the platforms including Android.

This change fixed the compiling error on Android platform.

vulkaninfo/vulkaninfo.c

index 900311c..2e67e62 100644 (file)
@@ -163,7 +163,7 @@ struct AppInstance {
     Window xlib_window;
 #endif
 #ifdef VK_USE_PLATFORM_ANDROID_KHR  // TODO
-    ANativeWindow *window;
+    struct ANativeWindow *window;
 #endif
 #ifdef VK_USE_PLATFORM_MACOS_MVK
     void *window;
@@ -1149,7 +1149,7 @@ static void AppDestroyWin32Window(struct AppInstance *inst) { DestroyWindow(inst
 //-----------------------------------------------------------
 
 #if defined(VK_USE_PLATFORM_XCB_KHR) || defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_WIN32_KHR) || \
-    defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_WAYLAND_KHR)
+    defined(VK_USE_PLATFORM_MACOS_MVK) || defined(VK_USE_PLATFORM_WAYLAND_KHR) || defined(VK_USE_PLATFORM_ANDROID_KHR)
 static void AppDestroySurface(struct AppInstance *inst) {  // same for all platforms
     vkDestroySurfaceKHR(inst->instance, inst->surface, NULL);
 }