godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74781 from Malcolmnixon/gles3_android

Browse Source 
Fix null-pointer dereference on Android systems when using gl_compatibility renderer
This commit is contained in:
Clay John 2023-03-11 17:53:37 -08:00 committed by GitHub
commit 550a779851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/android/display_server_android.cpp
View File

@ -676,16 +676,19 @@ void DisplayServerAndroid::cursor_set_custom_image(const Ref<Resource> &p_cursor
void DisplayServerAndroid::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) { void DisplayServerAndroid::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
#if defined(VULKAN_ENABLED) #if defined(VULKAN_ENABLED)
context_vulkan->set_vsync_mode(p_window, p_vsync_mode); if (context_vulkan) {
context_vulkan->set_vsync_mode(p_window, p_vsync_mode);
}
#endif #endif
} }
DisplayServer::VSyncMode DisplayServerAndroid::window_get_vsync_mode(WindowID p_window) const { DisplayServer::VSyncMode DisplayServerAndroid::window_get_vsync_mode(WindowID p_window) const {
#if defined(VULKAN_ENABLED) #if defined(VULKAN_ENABLED)
return context_vulkan->get_vsync_mode(p_window); if (context_vulkan) {
#else return context_vulkan->get_vsync_mode(p_window);
return DisplayServer::VSYNC_ENABLED; }
#endif #endif
return DisplayServer::VSYNC_ENABLED;
} }
void DisplayServerAndroid::reset_swap_buffers_flag() { void DisplayServerAndroid::reset_swap_buffers_flag() {