From c374c9853dd49365e06397f345e2395e4415828e Mon Sep 17 00:00:00 2001
From: Hans-Kristian Arntzen <maister@archlinux.us>
Date: Mon, 6 Jun 2016 22:27:41 +0200
Subject: [PATCH] Some potential fixes for Android Vulkan.

---
 gfx/common/vksym.h                |  1 +
 gfx/common/vulkan_common.c        | 48 +++++++++++++++++++++++++++++--
 gfx/drivers_context/android_ctx.c |  4 +--
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/gfx/common/vksym.h b/gfx/common/vksym.h
index 7b56e0aa4a..51f3f5d07c 100644
--- a/gfx/common/vksym.h
+++ b/gfx/common/vksym.h
@@ -223,6 +223,7 @@ typedef struct vulkan_context_fp
    PFN_vkGetPhysicalDeviceMemoryProperties       vkGetPhysicalDeviceMemoryProperties;
    PFN_vkGetPhysicalDeviceQueueFamilyProperties  vkGetPhysicalDeviceQueueFamilyProperties;
 
+   PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vkGetSurfacePresentModesKHR;
    PFN_vkGetPhysicalDeviceSurfaceSupportKHR      vkGetPhysicalDeviceSurfaceSupportKHR;
    PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
    PFN_vkGetPhysicalDeviceSurfaceFormatsKHR      vkGetPhysicalDeviceSurfaceFormatsKHR;
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 03217a5fb3..74a71bd4d7 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -1054,6 +1054,7 @@ static bool vulkan_load_instance_symbols(gfx_ctx_vulkan_data_t *vk)
    VK_GET_INSTANCE_PROC_ADDR(GetPhysicalDeviceQueueFamilyProperties);
    VK_GET_INSTANCE_PROC_ADDR(CreateDevice);
 
+   VK_GET_INSTANCE_PROC_ADDR(GetPhysicalDeviceSurfacePresentModesKHR);
    VK_GET_INSTANCE_PROC_ADDR(GetPhysicalDeviceSurfaceSupportKHR);
    VK_GET_INSTANCE_PROC_ADDR(GetPhysicalDeviceSurfaceCapabilitiesKHR);
    VK_GET_INSTANCE_PROC_ADDR(GetPhysicalDeviceSurfaceFormatsKHR);
@@ -1504,7 +1505,12 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk,
 
             if (VKFUNC(vkCreateAndroidSurfaceKHR)(vk->context.instance,
                      &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS)
+            {
+               RARCH_ERR("[Vulkan]: Failed to create Android surface.\n");
                return false;
+            }
+            RARCH_LOG("[Vulkan]: Created Android surface: %llu\n",
+                  (unsigned long long)vk->vk_surface);
          }
 #endif
          break;
@@ -1725,18 +1731,50 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
 {
    unsigned i;
    uint32_t format_count;
+   uint32_t present_mode_count;
    uint32_t desired_swapchain_images;
    VkSwapchainCreateInfoKHR info;
    VkSurfaceCapabilitiesKHR surface_properties;
    VkSurfaceFormatKHR formats[256];
+   VkPresentModeKHR present_modes[16];
    VkSurfaceFormatKHR format;
    VkExtent2D swapchain_size;
    VkSwapchainKHR old_swapchain;
    VkSurfaceTransformFlagBitsKHR pre_transform;
+   VkPresentModeKHR swapchain_present_mode = VK_PRESENT_MODE_FIFO_KHR;
 
-   /* TODO: Properly query these. */
-   VkPresentModeKHR swapchain_present_mode = swap_interval 
-      ? VK_PRESENT_MODE_FIFO_KHR : VK_PRESENT_MODE_MAILBOX_KHR;
+   present_mode_count = 0;
+   VKFUNC(vkGetPhysicalDeviceSurfacePresentModesKHR)(
+         vk->context.gpu, vk->vk_surface,
+         &present_mode_count, NULL);
+   if (present_mode_count < 1 || present_mode_count > 16)
+   {
+      RARCH_ERR("[Vulkan]: Bogus present modes found.\n");
+      return false;
+   }
+   VKFUNC(vkGetPhysicalDeviceSurfacePresentModesKHR)(
+         vk->context.gpu, vk->vk_surface,
+         &present_mode_count, present_modes);
+
+   for (i = 0; i < present_mode_count; i++)
+   {
+      if (!swap_interval && present_modes[i] == VK_PRESENT_MODE_MAILBOX_KHR)
+      {
+         swapchain_present_mode = VK_PRESENT_MODE_MAILBOX_KHR;
+         break;
+      }
+      else if (!swap_interval && present_modes[i] == VK_PRESENT_MODE_IMMEDIATE_KHR)
+      {
+         swapchain_present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR;
+         break;
+      }
+      else if (swap_interval && present_modes[i] == VK_PRESENT_MODE_FIFO_KHR)
+      {
+         /* Kind of tautological since FIFO must always be present. */
+         swapchain_present_mode = VK_PRESENT_MODE_FIFO_KHR;
+         break;
+      }
+   }
 
    RARCH_LOG("[Vulkan]: Creating swapchain with present mode: %u\n",
          (unsigned)swapchain_present_mode);
@@ -1772,6 +1810,9 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
    else
       swapchain_size           = surface_properties.currentExtent;
 
+   RARCH_LOG("[Vulkan]: Using swapchain size %u x %u.\n",
+         swapchain_size.width, swapchain_size.height);
+
    desired_swapchain_images = surface_properties.minImageCount + 1;
 
    /* Limit latency. */
@@ -1793,6 +1834,7 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
 
    old_swapchain               = vk->swapchain;
 
+   memset(&info, 0, sizeof(info));
    info.sType                  = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
    info.surface                = vk->vk_surface;
    info.minImageCount          = desired_swapchain_images;
diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c
index 976c02cb05..58cb47a57c 100644
--- a/gfx/drivers_context/android_ctx.c
+++ b/gfx/drivers_context/android_ctx.c
@@ -152,12 +152,12 @@ static void *android_gfx_ctx_init(void *video_driver)
    if (!android_app->window)
       goto unlock_error;
 
-   ANativeWindow_setBuffersGeometry(android_app->window, 0, 0, format);
-
    switch (android_api)
    {
       case GFX_CTX_OPENGL_API:
       case GFX_CTX_OPENGL_ES_API:
+         ANativeWindow_setBuffersGeometry(android_app->window, 0, 0, format);
+
 #ifdef HAVE_EGL
          if (!egl_create_context(&and->egl, context_attributes))
          {