Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

iOS MoltenVK code style cleanup.

Browse Source
This commit is contained in:
Alex Szpakowski 2017-09-21 20:30:25 -03:00
parent 80f9e2f199
commit e5cfb58f4a
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/uikit/SDL_uikitmetalview.m
View File

@ -86,7 +86,7 @@ UIKit_Mtl_AddMetalView(SDL_Window* window)
SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata; SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata;
SDL_uikitview *view = (SDL_uikitview*)data.uiwindow.rootViewController.view; SDL_uikitview *view = (SDL_uikitview*)data.uiwindow.rootViewController.view;
CGFloat scale = 1.0; CGFloat scale = 1.0;
if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) { if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
/* Set the scale to the natural scale factor of the screen - the /* Set the scale to the natural scale factor of the screen - the
* backing dimensions of the Metal view will match the pixel * backing dimensions of the Metal view will match the pixel

83
src/video/uikit/SDL_uikitvulkan.m
View File

@ -52,14 +52,16 @@ int UIKit_Vulkan_LoadLibrary(_THIS, const char *path)
SDL_bool hasIOSSurfaceExtension = SDL_FALSE; SDL_bool hasIOSSurfaceExtension = SDL_FALSE;
PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = NULL; PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr = NULL;
if(_this->vulkan_config.loader_handle) if (_this->vulkan_config.loader_handle) {
return SDL_SetError("MoltenVK/Vulkan already loaded"); return SDL_SetError("MoltenVK/Vulkan already loaded");
}
/* Load the Vulkan loader library */ /* Load the Vulkan loader library */
if(!path) if (!path) {
path = SDL_getenv("SDL_VULKAN_LIBRARY"); path = SDL_getenv("SDL_VULKAN_LIBRARY");
if(!path) }
{
if (!path) {
/* MoltenVK framework, currently, v0.17.0, has a static library and is /* MoltenVK framework, currently, v0.17.0, has a static library and is
* the recommended way to use the package. There is likely no object to * the recommended way to use the package. There is likely no object to
* load. */ * load. */
@ -67,22 +69,19 @@ int UIKit_Vulkan_LoadLibrary(_THIS, const char *path)
(PFN_vkGetInstanceProcAddr)dlsym(DEFAULT_HANDLE, (PFN_vkGetInstanceProcAddr)dlsym(DEFAULT_HANDLE,
"vkGetInstanceProcAddr"); "vkGetInstanceProcAddr");
} }
if(vkGetInstanceProcAddr) if (vkGetInstanceProcAddr) {
{
_this->vulkan_config.loader_handle = DEFAULT_HANDLE; _this->vulkan_config.loader_handle = DEFAULT_HANDLE;
} } else {
else if (!path) {
{
if (!path)
{
/* Look for the .dylib packaged with the application instead. */ /* Look for the .dylib packaged with the application instead. */
path = DEFAULT_MOLTENVK; path = DEFAULT_MOLTENVK;
} }
_this->vulkan_config.loader_handle = SDL_LoadObject(path); _this->vulkan_config.loader_handle = SDL_LoadObject(path);
if(!_this->vulkan_config.loader_handle) if (!_this->vulkan_config.loader_handle) {
return -1; return -1;
}
SDL_strlcpy(_this->vulkan_config.loader_path, path, SDL_strlcpy(_this->vulkan_config.loader_path, path,
SDL_arraysize(_this->vulkan_config.loader_path)); SDL_arraysize(_this->vulkan_config.loader_path));
vkGetInstanceProcAddr = vkGetInstanceProcAddr =
@ -90,8 +89,8 @@ int UIKit_Vulkan_LoadLibrary(_THIS, const char *path)
_this->vulkan_config.loader_handle, _this->vulkan_config.loader_handle,
"vkGetInstanceProcAddr"); "vkGetInstanceProcAddr");
} }
if(!vkGetInstanceProcAddr)
{ if (!vkGetInstanceProcAddr) {
SDL_SetError("Failed to find %s in either executable or %s: %s", SDL_SetError("Failed to find %s in either executable or %s: %s",
"vkGetInstanceProcAddr", "vkGetInstanceProcAddr",
DEFAULT_MOLTENVK, DEFAULT_MOLTENVK,
@ -103,33 +102,36 @@ int UIKit_Vulkan_LoadLibrary(_THIS, const char *path)
_this->vulkan_config.vkEnumerateInstanceExtensionProperties = _this->vulkan_config.vkEnumerateInstanceExtensionProperties =
(void *)((PFN_vkGetInstanceProcAddr)_this->vulkan_config.vkGetInstanceProcAddr)( (void *)((PFN_vkGetInstanceProcAddr)_this->vulkan_config.vkGetInstanceProcAddr)(
VK_NULL_HANDLE, "vkEnumerateInstanceExtensionProperties"); VK_NULL_HANDLE, "vkEnumerateInstanceExtensionProperties");
if(!_this->vulkan_config.vkEnumerateInstanceExtensionProperties)
{ if (!_this->vulkan_config.vkEnumerateInstanceExtensionProperties) {
SDL_SetError("No vkEnumerateInstanceExtensionProperties found."); SDL_SetError("No vkEnumerateInstanceExtensionProperties found.");
goto fail; goto fail;
} }
extensions = SDL_Vulkan_CreateInstanceExtensionsList( extensions = SDL_Vulkan_CreateInstanceExtensionsList(
(PFN_vkEnumerateInstanceExtensionProperties) (PFN_vkEnumerateInstanceExtensionProperties)
_this->vulkan_config.vkEnumerateInstanceExtensionProperties, _this->vulkan_config.vkEnumerateInstanceExtensionProperties,
&extensionCount); &extensionCount);
if(!extensions)
if (!extensions) {
goto fail; goto fail;
for(Uint32 i = 0; i < extensionCount; i++)
{
if(SDL_strcmp(VK_KHR_SURFACE_EXTENSION_NAME, extensions[i].extensionName) == 0)
hasSurfaceExtension = SDL_TRUE;
else if(SDL_strcmp(VK_MVK_IOS_SURFACE_EXTENSION_NAME, extensions[i].extensionName) == 0)
hasIOSSurfaceExtension = SDL_TRUE;
} }
for (Uint32 i = 0; i < extensionCount; i++) {
if (SDL_strcmp(VK_KHR_SURFACE_EXTENSION_NAME, extensions[i].extensionName) == 0) {
hasSurfaceExtension = SDL_TRUE;
} else if (SDL_strcmp(VK_MVK_IOS_SURFACE_EXTENSION_NAME, extensions[i].extensionName) == 0) {
hasIOSSurfaceExtension = SDL_TRUE;
}
}
SDL_free(extensions); SDL_free(extensions);
if(!hasSurfaceExtension)
{ if (!hasSurfaceExtension) {
SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the " SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the "
VK_KHR_SURFACE_EXTENSION_NAME " extension"); VK_KHR_SURFACE_EXTENSION_NAME " extension");
goto fail; goto fail;
} } else if (!hasIOSSurfaceExtension) {
else if(!hasIOSSurfaceExtension)
{
SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the " SDL_SetError("Installed MoltenVK/Vulkan doesn't implement the "
VK_MVK_IOS_SURFACE_EXTENSION_NAME "extension"); VK_MVK_IOS_SURFACE_EXTENSION_NAME "extension");
goto fail; goto fail;
@ -144,10 +146,10 @@ fail:
void UIKit_Vulkan_UnloadLibrary(_THIS) void UIKit_Vulkan_UnloadLibrary(_THIS)
{ {
if(_this->vulkan_config.loader_handle) if (_this->vulkan_config.loader_handle) {
{ if (_this->vulkan_config.loader_handle != DEFAULT_HANDLE) {
if (_this->vulkan_config.loader_handle != DEFAULT_HANDLE)
SDL_UnloadObject(_this->vulkan_config.loader_handle); SDL_UnloadObject(_this->vulkan_config.loader_handle);
}
_this->vulkan_config.loader_handle = NULL; _this->vulkan_config.loader_handle = NULL;
} }
} }
@ -160,11 +162,11 @@ SDL_bool UIKit_Vulkan_GetInstanceExtensions(_THIS,
static const char *const extensionsForUIKit[] = { static const char *const extensionsForUIKit[] = {
VK_KHR_SURFACE_EXTENSION_NAME, VK_MVK_IOS_SURFACE_EXTENSION_NAME VK_KHR_SURFACE_EXTENSION_NAME, VK_MVK_IOS_SURFACE_EXTENSION_NAME
}; };
if(!_this->vulkan_config.loader_handle) if (!_this->vulkan_config.loader_handle) {
{
SDL_SetError("Vulkan is not loaded"); SDL_SetError("Vulkan is not loaded");
return SDL_FALSE; return SDL_FALSE;
} }
return SDL_Vulkan_GetInstanceExtensions_Helper( return SDL_Vulkan_GetInstanceExtensions_Helper(
count, names, SDL_arraysize(extensionsForUIKit), count, names, SDL_arraysize(extensionsForUIKit),
extensionsForUIKit); extensionsForUIKit);
@ -184,30 +186,29 @@ SDL_bool UIKit_Vulkan_CreateSurface(_THIS,
VkIOSSurfaceCreateInfoMVK createInfo = {}; VkIOSSurfaceCreateInfoMVK createInfo = {};
VkResult result; VkResult result;
if(!_this->vulkan_config.loader_handle) if (!_this->vulkan_config.loader_handle) {
{
SDL_SetError("Vulkan is not loaded"); SDL_SetError("Vulkan is not loaded");
return SDL_FALSE; return SDL_FALSE;
} }
if(!vkCreateIOSSurfaceMVK) if (!vkCreateIOSSurfaceMVK) {
{
SDL_SetError(VK_MVK_IOS_SURFACE_EXTENSION_NAME SDL_SetError(VK_MVK_IOS_SURFACE_EXTENSION_NAME
" extension is not enabled in the Vulkan instance."); " extension is not enabled in the Vulkan instance.");
return SDL_FALSE; return SDL_FALSE;
} }
createInfo.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK; createInfo.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK;
createInfo.pNext = NULL; createInfo.pNext = NULL;
createInfo.flags = 0; createInfo.flags = 0;
createInfo.pView = (__bridge void *)UIKit_Mtl_AddMetalView(window); createInfo.pView = (__bridge void *)UIKit_Mtl_AddMetalView(window);
result = vkCreateIOSSurfaceMVK(instance, &createInfo, result = vkCreateIOSSurfaceMVK(instance, &createInfo,
NULL, surface); NULL, surface);
if(result != VK_SUCCESS) if (result != VK_SUCCESS) {
{
SDL_SetError("vkCreateIOSSurfaceMVK failed: %s", SDL_SetError("vkCreateIOSSurfaceMVK failed: %s",
SDL_Vulkan_GetResultString(result)); SDL_Vulkan_GetResultString(result));
return SDL_FALSE; return SDL_FALSE;
} }
return SDL_TRUE; return SDL_TRUE;
} }