From fff4240bb43a9e5680017087def8b884a23ff657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 5 Nov 2019 12:01:00 +0100 Subject: Fix code formatting issues and VS compilation Also temporarily disable multicheck build so that we get a full build even when there are style issues on Vulkan. Fixes #33356. --- platform/osx/os_osx.mm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'platform/osx') diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 5757cd879d..fa1de631f0 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -367,7 +367,7 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) { #if defined(VULKAN_ENABLED) if (OS_OSX::singleton->video_driver_index == OS::VIDEO_DRIVER_VULKAN) { - CALayer* layer = [OS_OSX::singleton->window_view layer]; + CALayer *layer = [OS_OSX::singleton->window_view layer]; layer.contentsScale = OS_OSX::singleton->_display_scale(); } #endif @@ -395,7 +395,7 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) { #if defined(VULKAN_ENABLED) if (OS_OSX::singleton->video_driver_index == OS::VIDEO_DRIVER_VULKAN) { - CALayer* layer = [OS_OSX::singleton->window_view layer]; + CALayer *layer = [OS_OSX::singleton->window_view layer]; layer.contentsScale = OS_OSX::singleton->_display_scale(); OS_OSX::singleton->context_vulkan->window_resize(0, OS_OSX::singleton->window_size.width, OS_OSX::singleton->window_size.height); } @@ -462,7 +462,7 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) { } - (void)cancelComposition; -- (CALayer*)makeBackingLayer; +- (CALayer *)makeBackingLayer; - (BOOL)wantsUpdateLayer; - (void)updateLayer; @@ -477,10 +477,10 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) { } } -- (CALayer*)makeBackingLayer { +- (CALayer *)makeBackingLayer { #if defined(VULKAN_ENABLED) if (OS_OSX::singleton->video_driver_index == OS::VIDEO_DRIVER_VULKAN) { - CALayer* layer = [[CAMetalLayer class] layer]; + CALayer *layer = [[CAMetalLayer class] layer]; layer.contentsScale = OS_OSX::singleton->_display_scale(); return layer; } @@ -1949,7 +1949,6 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c cursors_cache.erase(p_shape); } - } void OS_OSX::set_mouse_show(bool p_show) { -- cgit v1.2.3