Replace LoadVulkanLibrary() with an extern const char *VulkanLibraryName

This commit is contained in:
baldurk
2016-04-30 17:07:35 +02:00
parent 0929923e9d
commit 375747654d
4 changed files with 6 additions and 12 deletions
+3
View File
@@ -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
{
+1 -4
View File
@@ -167,7 +167,4 @@ VkResult WrappedVulkan::vkCreateXlibSurfaceKHR(
#endif
void *LoadVulkanLibrary()
{
return Process::LoadModule("libvulkan.so");
}
const char *VulkanLibraryName = "libvulkan.so";
+1 -4
View File
@@ -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)
{
+1 -4
View File
@@ -107,7 +107,4 @@ VkBool32 WrappedVulkan::vkGetPhysicalDeviceWin32PresentationSupportKHR(
return ObjDisp(physicalDevice)->GetPhysicalDeviceWin32PresentationSupportKHR(Unwrap(physicalDevice), queueFamilyIndex);
}
void *LoadVulkanLibrary()
{
return Process::LoadModule("vulkan-1.dll");
}
const char *VulkanLibraryName = "vulkan-1.dll";