asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #68608 from dsnopek/gl-manager-nullptr

Browse source 
Added missing null checks for gl_manager in MacOS and Windows display servers
This commit is contained in:
Rémi Verschelde 2022-11-13 15:52:42 +01:00
commit b05e1e7d69
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/macos/display_server_macos.mm
View file

@ -2945,7 +2945,10 @@ int64_t DisplayServerMacOS::window_get_native_handle(HandleType p_handle_type, W
} }
#ifdef GLES3_ENABLED #ifdef GLES3_ENABLED
case OPENGL_CONTEXT: { case OPENGL_CONTEXT: {
return (int64_t)gl_manager->get_context(p_window); if (gl_manager) {
return (int64_t)gl_manager->get_context(p_window);
}
return 0;
} }
#endif #endif
default: { default: {

10
platform/windows/display_server_windows.cpp
View file

@ -743,10 +743,16 @@ int64_t DisplayServerWindows::window_get_native_handle(HandleType p_handle_type,
} }
#if defined(GLES3_ENABLED) #if defined(GLES3_ENABLED)
case WINDOW_VIEW: { case WINDOW_VIEW: {
return (int64_t)gl_manager->get_hdc(p_window); if (gl_manager) {
return (int64_t)gl_manager->get_hdc(p_window);
}
return 0;
} }
case OPENGL_CONTEXT: { case OPENGL_CONTEXT: {
return (int64_t)gl_manager->get_hglrc(p_window); if (gl_manager) {
return (int64_t)gl_manager->get_hglrc(p_window);
}
return 0;
} }
#endif #endif
default: { default: {