tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-18 08:25:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32821 from bruvzg/vlk_fix_macos_exit

Browse Source 
[Vulkan, macOS] Fix RID leaks and crashes on exit.
This commit is contained in:
Rémi Verschelde
2020-02-11 12:04:20 +01:00
committed by GitHub
parent d10406a59a a85923b972
commit a8e14bee58
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/osx/os_osx.mm
+20 -13
View File
@@ -282,6 +282,8 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) {
//_Godotwindow* window;
}
- (void)windowWillClose:(NSNotification *)notification;
@end
@implementation GodotWindowDelegate
@@ -294,6 +296,24 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) {
return NO;
}
- (void)windowWillClose:(NSNotification *)notification {
#if defined(VULKAN_ENABLED)
if (OS_OSX::singleton->video_driver_index == OS::VIDEO_DRIVER_VULKAN) {
if (OS_OSX::singleton->rendering_device_vulkan) {
OS_OSX::singleton->rendering_device_vulkan->finalize();
memdelete(OS_OSX::singleton->rendering_device_vulkan);
OS_OSX::singleton->rendering_device_vulkan = NULL;
}
if (OS_OSX::singleton->context_vulkan) {
memdelete(OS_OSX::singleton->context_vulkan);
OS_OSX::singleton->context_vulkan = NULL;
}
}
#endif
}
- (void)windowDidEnterFullScreen:(NSNotification *)notification {
OS_OSX::singleton->zoomed = true;
@@ -1632,19 +1652,6 @@ void OS_OSX::finalize() {
memdelete(context_gles2);
}
#endif
#if defined(VULKAN_ENABLED)
if (video_driver_index == VIDEO_DRIVER_VULKAN) {
if (rendering_device_vulkan) {
rendering_device_vulkan->finalize();
memdelete(rendering_device_vulkan);
}
if (context_vulkan)
memdelete(context_vulkan);
}
#endif
CFNotificationCenterRemoveObserver(CFNotificationCenterGetDistributedCenter(), NULL, kTISNotifySelectedKeyboardInputSourceChanged, NULL);
CGDisplayRemoveReconfigurationCallback(displays_arrangement_changed, NULL);