From 43ed298ad8e5c55df54f41abb37476e9e11acc37 Mon Sep 17 00:00:00 2001
From: Tobin Ehlis <tobine@google.com>
Date: Thu, 28 Apr 2016 10:17:33 -0600
Subject: [PATCH] demos: Fix-ups so that cube/tri build and run on both linux &
 android

---
 demos/android/jni/Android.mk |  6 ++++--
 demos/cube.c                 | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/demos/android/jni/Android.mk b/demos/android/jni/Android.mk
index d852176..5042102 100644
--- a/demos/android/jni/Android.mk
+++ b/demos/android/jni/Android.mk
@@ -23,7 +23,8 @@ LOCAL_SRC_FILES += $(DEMO_DIR)/tri.c \
                    $(SRC_DIR)/common/vulkan_wrapper.cpp
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \
                     $(DEMO_DIR)/android/include \
-                    $(SRC_DIR)/libs
+                    $(SRC_DIR)/libs \
+                    $(SRC_DIR)/common
 LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
 LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue
 LOCAL_LDLIBS    := -llog -landroid
@@ -35,7 +36,8 @@ LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \
                    $(SRC_DIR)/common/vulkan_wrapper.cpp
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \
                     $(DEMO_DIR)/android/include \
-                    $(SRC_DIR)/libs
+                    $(SRC_DIR)/libs \
+                    $(SRC_DIR)/common
 LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
 LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue
 LOCAL_LDLIBS    := -llog -landroid
diff --git a/demos/cube.c b/demos/cube.c
index e8da31e..bc53298 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -336,11 +336,11 @@ struct demo {
     HINSTANCE connection;        // hInstance - Windows Instance
     char name[APP_NAME_STR_LEN]; // Name to put on the window/icon
     HWND window;                 // hWnd - window handle
-#elif defined(VK_USE_PLATFORM_XLIB_KHR)
+#elif defined(VK_USE_PLATFORM_XLIB_KHR) | defined(VK_USE_PLATFORM_XCB_KHR)
     Display* display;
     Window xlib_window;
     Atom xlib_wm_delete_window;
-#elif defined(VK_USE_PLATFORM_XCB_KHR)
+
     xcb_connection_t *connection;
     xcb_screen_t *screen;
     xcb_window_t xcb_window;
@@ -2064,8 +2064,7 @@ static void demo_create_window(struct demo *demo) {
         exit(1);
     }
 }
-<<<<<<< 0d3f96c9766e309ab81b36fc908cdfde2ac6915a
-#else
+#elif defined(VK_USE_PLATFORM_XLIB_KHR) | defined(VK_USE_PLATFORM_XCB_KHR)
 static void demo_create_xlib_window(struct demo *demo) {
 
     demo->display = XOpenDisplay(NULL);
@@ -2164,7 +2163,6 @@ static void demo_run_xlib(struct demo *demo) {
     }
 }
 
-#elif defined(VK_USE_PLATFORM_XCB_KHR)
 static void demo_handle_xcb_event(struct demo *demo,
                               const xcb_generic_event_t *event) {
     uint8_t event_code = event->response_type & 0x7f;
@@ -2395,7 +2393,9 @@ static void demo_init_vk(struct demo *demo) {
     /* Look for instance extensions */
     VkBool32 surfaceExtFound = 0;
     VkBool32 platformSurfaceExtFound = 0;
+#if defined(VK_USE_PLATFORM_XLIB_KHR) | defined(VK_USE_PLATFORM_XCB_KHR)
     VkBool32 xlibSurfaceExtFound = 0;
+#endif
     memset(demo->extension_names, 0, sizeof(demo->extension_names));
 
     err = vkEnumerateInstanceExtensionProperties(
@@ -2422,7 +2422,7 @@ static void demo_init_vk(struct demo *demo) {
                 demo->extension_names[demo->enabled_extension_count++] =
                     VK_KHR_WIN32_SURFACE_EXTENSION_NAME;
             }
-#if defined(VK_USE_PLATFORM_XLIB_KHR)
+#elif defined(VK_USE_PLATFORM_XLIB_KHR) | defined(VK_USE_PLATFORM_XCB_KHR)
             if (!strcmp(VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
                         instance_extensions[i].extensionName)) {
                 platformSurfaceExtFound = 1;
@@ -2430,7 +2430,7 @@ static void demo_init_vk(struct demo *demo) {
                 demo->extension_names[demo->enabled_extension_count++] =
                     VK_KHR_XLIB_SURFACE_EXTENSION_NAME;
             }
-#elif defined(VK_USE_PLATFORM_XCB_KHR)
+
             if (!strcmp(VK_KHR_XCB_SURFACE_EXTENSION_NAME,
                         instance_extensions[i].extensionName)) {
                 platformSurfaceExtFound = 1;
@@ -2494,7 +2494,7 @@ static void demo_init_vk(struct demo *demo) {
                  "vkCreateInstance Failure");
 #endif
     }
-#if defined(VK_USE_PLATOFMR_XLIB_KHR)
+#if defined(VK_USE_PLATFORM_XLIB_KHR)
     if (demo->use_xlib && !xlibSurfaceExtFound) {
         ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find "
                  "the " VK_KHR_XLIB_SURFACE_EXTENSION_NAME
@@ -2788,7 +2788,7 @@ static void demo_init_vk_swapchain(struct demo *demo) {
     err = vkCreateAndroidSurfaceKHR(demo->inst, &createInfo, NULL, &demo->surface);
 #endif
     if (demo->use_xlib) {
-#if defined(VK_USE_PLATFORM_XCB_KHR)
+#if defined(VK_USE_PLATFORM_XLIB_KHR)
         VkXlibSurfaceCreateInfoKHR createInfo;
         createInfo.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
         createInfo.pNext = NULL;
@@ -2801,7 +2801,7 @@ static void demo_init_vk_swapchain(struct demo *demo) {
 #endif
     }
     else {
-#if defined(VK_USE_PLATOFORM_X11_KHR)
+#if defined(VK_USE_PLATFORM_XCB_KHR)
         VkXcbSurfaceCreateInfoKHR createInfo;
         createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
         createInfo.pNext = NULL;
@@ -3136,7 +3136,7 @@ void android_main(struct android_app *app)
     }
 
 }
-#elif defined(VK_USE_PLATFORM_XCB_KHR)
+#else
 int main(int argc, char **argv) {
     struct demo demo;
 
-- 
2.7.4