diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-05 12:49:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 12:05:24 +0100 |
| commit | 7f430b03a70e70ba9f63c192beb2f31dd884f907 (patch) | |
| tree | 281fe803d2da04ee13d940bdbe692ee5bdcce8b0 /platform/osx | |
| parent | b509c814fcf91dbd4a9c19a307882dc26dec13e3 (diff) | |
| parent | fff4240bb43a9e5680017087def8b884a23ff657 (diff) | |
Merge pull request #33359 from akien-mga/vulkan
Fix code formatting issues and VS compilation
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/os_osx.mm | 11 |
1 files changed, 5 insertions, 6 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) { |