From 396b83699bd8b24a4a29a1c1d16647b67114469e Mon Sep 17 00:00:00 2001
From: Michael Rennie <m.rennie@partner.samsung.com>
Date: Mon, 8 Aug 2016 11:51:42 +0100
Subject: [PATCH] Fixed vulkan library used for Android replay, plus cmdline
 args.

---
 renderdoc/driver/vulkan/vk_android.cpp | 2 ++
 renderdoc/driver/vulkan/vk_linux.cpp   | 2 ++
 renderdoc/driver/vulkan/vk_posix.cpp   | 2 --
 renderdoccmd/renderdoccmd_android.cpp  | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_android.cpp b/renderdoc/driver/vulkan/vk_android.cpp
index a698c2d54..30aabfe22 100644
--- a/renderdoc/driver/vulkan/vk_android.cpp
+++ b/renderdoc/driver/vulkan/vk_android.cpp
@@ -51,3 +51,5 @@ void VulkanReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h
   h = 500;    // FIXME
   RDCLOG("VulkanReplay::GetOutputWindowDimensions: %i, %i", w, h);
 }
+
+const char *VulkanLibraryName = "libvulkan.so";
diff --git a/renderdoc/driver/vulkan/vk_linux.cpp b/renderdoc/driver/vulkan/vk_linux.cpp
index 2ba526050..4dd054663 100644
--- a/renderdoc/driver/vulkan/vk_linux.cpp
+++ b/renderdoc/driver/vulkan/vk_linux.cpp
@@ -105,3 +105,5 @@ void VulkanReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h
     free(geom);
   }
 }
+
+const char *VulkanLibraryName = "libvulkan.so.1";
diff --git a/renderdoc/driver/vulkan/vk_posix.cpp b/renderdoc/driver/vulkan/vk_posix.cpp
index ecd6f008f..483eb96b5 100644
--- a/renderdoc/driver/vulkan/vk_posix.cpp
+++ b/renderdoc/driver/vulkan/vk_posix.cpp
@@ -243,5 +243,3 @@ VkResult WrappedVulkan::vkCreateAndroidSurfaceKHR(VkInstance instance,
   return ret;
 }
 #endif
-
-const char *VulkanLibraryName = "libvulkan.so.1";
diff --git a/renderdoccmd/renderdoccmd_android.cpp b/renderdoccmd/renderdoccmd_android.cpp
index cdca7a633..fe9ec8699 100644
--- a/renderdoccmd/renderdoccmd_android.cpp
+++ b/renderdoccmd/renderdoccmd_android.cpp
@@ -78,7 +78,7 @@ void handle_cmd(android_app *app, int32_t cmd)
                           "APP_CMD_INIT_WINDOW: android_state->window: %p", android_state->window);
 
       const char *argv[] = {
-          "renderdoccmd", "/sdcard/capture.rdc",
+          "renderdoccmd", "replay", "/sdcard/capture.rdc",
       };
       int argc = sizeof(argv) / sizeof(argv[0]);
       renderdoccmd(argc, (char **)argv);