From 375747654d02b87ed7952da5826ef9b0b8b2e364 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sat, 30 Apr 2016 17:07:35 +0200
Subject: [PATCH] Replace LoadVulkanLibrary() with an extern const char
 *VulkanLibraryName

---
 renderdoc/driver/vulkan/vk_common.h   | 3 +++
 renderdoc/driver/vulkan/vk_linux.cpp  | 5 +----
 renderdoc/driver/vulkan/vk_replay.cpp | 5 +----
 renderdoc/driver/vulkan/vk_win32.cpp  | 5 +----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h
index 6ab2de968..4371eb604 100644
--- a/renderdoc/driver/vulkan/vk_common.h
+++ b/renderdoc/driver/vulkan/vk_common.h
@@ -64,6 +64,9 @@ void DoPipelineBarrier(VkCommandBuffer cmd, uint32_t count, VkMemoryBarrier *bar
 int SampleCount(VkSampleCountFlagBits countFlag);
 int StageIndex(VkShaderStageFlagBits stageFlag);
 
+// in vk_<platform>.cpp
+extern const char *VulkanLibraryName;
+
 // structure for casting to easily iterate and template specialising Serialise
 struct VkGenericStruct
 {
diff --git a/renderdoc/driver/vulkan/vk_linux.cpp b/renderdoc/driver/vulkan/vk_linux.cpp
index b1d9d9693..b1397e5e9 100644
--- a/renderdoc/driver/vulkan/vk_linux.cpp
+++ b/renderdoc/driver/vulkan/vk_linux.cpp
@@ -167,7 +167,4 @@ VkResult WrappedVulkan::vkCreateXlibSurfaceKHR(
 
 #endif
 
-void *LoadVulkanLibrary()
-{
-	return Process::LoadModule("libvulkan.so");
-}
\ No newline at end of file
+const char *VulkanLibraryName = "libvulkan.so";
diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp
index b010b4cd3..cb0edd66d 100644
--- a/renderdoc/driver/vulkan/vk_replay.cpp
+++ b/renderdoc/driver/vulkan/vk_replay.cpp
@@ -4581,14 +4581,11 @@ void VulkanReplay::SetProxyBufferData(ResourceId bufid, byte *data, size_t dataS
 	VULKANNOTIMP("SetProxyTextureData");
 }
 
-// in vk_<platform>.cpp
-void *LoadVulkanLibrary();
-
 ReplayCreateStatus Vulkan_CreateReplayDevice(const char *logfile, IReplayDriver **driver)
 {
 	RDCDEBUG("Creating a VulkanReplay replay device");
 
-	void *module = LoadVulkanLibrary();
+	void *module = Process::LoadModule(VulkanLibraryName);
 	
 	if(module == NULL)
 	{
diff --git a/renderdoc/driver/vulkan/vk_win32.cpp b/renderdoc/driver/vulkan/vk_win32.cpp
index b9a712f4d..5a87d37b2 100644
--- a/renderdoc/driver/vulkan/vk_win32.cpp
+++ b/renderdoc/driver/vulkan/vk_win32.cpp
@@ -107,7 +107,4 @@ VkBool32 WrappedVulkan::vkGetPhysicalDeviceWin32PresentationSupportKHR(
 	return ObjDisp(physicalDevice)->GetPhysicalDeviceWin32PresentationSupportKHR(Unwrap(physicalDevice), queueFamilyIndex);
 }
 
-void *LoadVulkanLibrary()
-{
-	return Process::LoadModule("vulkan-1.dll");
-}
\ No newline at end of file
+const char *VulkanLibraryName = "vulkan-1.dll";