From 9cd2e9ec8fc0127393dfce9c0359d500c8c238be Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 09 Apr 2019 02:22:50 +0000
Subject: [PATCH] updae source to 2.0.9 source
---
source/src/video/cocoa/SDL_cocoavulkan.m | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/source/src/video/cocoa/SDL_cocoavulkan.m b/source/src/video/cocoa/SDL_cocoavulkan.m
index 2cf55bb..0e53d21 100644
--- a/source/src/video/cocoa/SDL_cocoavulkan.m
+++ b/source/src/video/cocoa/SDL_cocoavulkan.m
@@ -58,8 +58,7 @@
PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = NULL;
if (_this->vulkan_config.loader_handle) {
- SDL_SetError("Vulkan/MoltenVK already loaded");
- return -1;
+ return SDL_SetError("Vulkan/MoltenVK already loaded");
}
/* Load the Vulkan loader library */
@@ -80,6 +79,7 @@
_this->vulkan_config.loader_handle = DEFAULT_HANDLE;
} else {
const char** paths;
+ const char *foundPath = NULL;
int numPaths;
int i;
@@ -92,18 +92,17 @@
paths = defaultPaths;
numPaths = SDL_arraysize(defaultPaths);
}
-
- for (i=0; i < numPaths; i++) {
- _this->vulkan_config.loader_handle = SDL_LoadObject(paths[i]);
- if (_this->vulkan_config.loader_handle)
- break;
- else
- continue;
- }
- if (i == numPaths)
- return -1;
- SDL_strlcpy(_this->vulkan_config.loader_path, paths[i],
+ for (i = 0; i < numPaths && _this->vulkan_config.loader_handle == NULL; i++) {
+ foundPath = paths[i];
+ _this->vulkan_config.loader_handle = SDL_LoadObject(foundPath);
+ }
+
+ if (_this->vulkan_config.loader_handle == NULL) {
+ return SDL_SetError("Failed to load Vulkan/MoltenVK library");
+ }
+
+ SDL_strlcpy(_this->vulkan_config.loader_path, foundPath,
SDL_arraysize(_this->vulkan_config.loader_path));
vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)SDL_LoadFunction(
_this->vulkan_config.loader_handle, "vkGetInstanceProcAddr");
--
Gitblit v1.9.3