diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-05 12:01:00 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 12:05:19 +0100 |
| commit | fff4240bb43a9e5680017087def8b884a23ff657 (patch) | |
| tree | 281fe803d2da04ee13d940bdbe692ee5bdcce8b0 /platform | |
| parent | b509c814fcf91dbd4a9c19a307882dc26dec13e3 (diff) | |
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.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/os_osx.mm | 11 | ||||
| -rwxr-xr-x | platform/windows/os_windows.cpp | 2 |
2 files changed, 5 insertions, 8 deletions
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) { diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 40ced686c8..133dc9004d 100755 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1457,7 +1457,6 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int context_gles2 = NULL; ERR_FAIL_V(ERR_UNAVAILABLE); } - } #endif #if defined(VULKAN_ENABLED) @@ -1659,7 +1658,6 @@ void OS_Windows::finalize() { if (context_gles2) memdelete(context_gles2); - } #endif #if defined(VULKAN_ENABLED) |