Archive/Play-
0
0
Fork 0
mirror of https://github.com/jpd002/Play-.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply style fixes.

Browse source
This commit is contained in:
Jean-Philip Desjardins 2021-06-29 08:14:27 -04:00
parent bc6247d399
commit 77eb2d3090
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/gs/GSH_Vulkan/GSH_Vulkan.cpp
View file

@ -54,11 +54,11 @@ Framework::Vulkan::CInstance CGSH_Vulkan::CreateInstance(bool useValidationLayer
extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
extensions.push_back(VK_MVK_IOS_SURFACE_EXTENSION_NAME); extensions.push_back(VK_MVK_IOS_SURFACE_EXTENSION_NAME);
#else #else
extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME); extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME);
#endif #endif
#endif #endif
#ifdef __linux__ #ifdef __linux__
extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);

7
Source/ui_ios/GSH_VulkaniOS.cpp
View file

@ -3,7 +3,7 @@
#include "vulkan/Loader.h" #include "vulkan/Loader.h"
CGSH_VulkaniOS::CGSH_VulkaniOS(CAMetalLayer* layer) CGSH_VulkaniOS::CGSH_VulkaniOS(CAMetalLayer* layer)
: m_layer(layer) : m_layer(layer)
{ {
} }
@ -15,14 +15,14 @@ CGSHandler::FactoryFunction CGSH_VulkaniOS::GetFactoryFunction(CAMetalLayer* lay
void CGSH_VulkaniOS::InitializeImpl() void CGSH_VulkaniOS::InitializeImpl()
{ {
m_instance = CreateInstance(true); m_instance = CreateInstance(true);
VkIOSSurfaceCreateInfoMVK surfaceCreateInfo = {}; VkIOSSurfaceCreateInfoMVK surfaceCreateInfo = {};
surfaceCreateInfo.pView = (__bridge void*)m_layer; surfaceCreateInfo.pView = (__bridge void*)m_layer;
auto result = m_instance.vkCreateIOSSurfaceMVK(m_instance, &surfaceCreateInfo, nullptr, &m_context->surface); auto result = m_instance.vkCreateIOSSurfaceMVK(m_instance, &surfaceCreateInfo, nullptr, &m_context->surface);
CHECKVULKANERROR(result); CHECKVULKANERROR(result);
CGSH_Vulkan::InitializeImpl(); CGSH_Vulkan::InitializeImpl();
{ {
CGSize drawableSize = m_layer.drawableSize; CGSize drawableSize = m_layer.drawableSize;
@ -37,5 +37,4 @@ void CGSH_VulkaniOS::InitializeImpl()
void CGSH_VulkaniOS::PresentBackbuffer() void CGSH_VulkaniOS::PresentBackbuffer()
{ {
} }

10
Source/ui_ios/RenderView.mm
View file

@ -34,17 +34,17 @@
} }
} }
} }
self.layer.opaque = TRUE; self.layer.opaque = TRUE;
auto gsHandlerId = CAppConfig::GetInstance().GetPreferenceInteger(PREFERENCE_VIDEO_GS_HANDLER); auto gsHandlerId = CAppConfig::GetInstance().GetPreferenceInteger(PREFERENCE_VIDEO_GS_HANDLER);
if(gsHandlerId == PREFERENCE_VALUE_VIDEO_GS_HANDLER_OPENGL) if(gsHandlerId == PREFERENCE_VALUE_VIDEO_GS_HANDLER_OPENGL)
{ {
CAEAGLLayer* layer = (CAEAGLLayer*)self.layer; CAEAGLLayer* layer = (CAEAGLLayer*)self.layer;
layer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys: layer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithBool: FALSE], kEAGLDrawablePropertyRetainedBacking, [NSNumber numberWithBool:FALSE], kEAGLDrawablePropertyRetainedBacking,
kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat, kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat,
nil]; nil];
} }
} }

4
Source/ui_ios/SettingsViewController.mm
View file

@ -14,10 +14,10 @@
default: default:
[[fallthrough]]; [[fallthrough]];
case PREFERENCE_VALUE_VIDEO_GS_HANDLER_OPENGL: case PREFERENCE_VALUE_VIDEO_GS_HANDLER_OPENGL:
[gsHandlerName setText: @"OpenGL"]; [gsHandlerName setText:@"OpenGL"];
break; break;
case PREFERENCE_VALUE_VIDEO_GS_HANDLER_VULKAN: case PREFERENCE_VALUE_VIDEO_GS_HANDLER_VULKAN:
[gsHandlerName setText: @"Vulkan"]; [gsHandlerName setText:@"Vulkan"];
break; break;
} }
} }