Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix null-pointer dereference on Android systems when using gl_compatibility renderer #74781

Merged
merged 1 commit into from
Mar 12, 2023

Conversation

Malcolmnixon
Copy link
Contributor

This pull request fixes a null-pointer dereference crash on Android systems when using the gl_compatibility renderer. The vsync-mode functions assumed that VULKAN_ENABLED compiler define also implied that Vulkan was active at runtime. The result was that when the gl_compatibility renderer was used, the code would call member functions on the null vulkan context.

@Malcolmnixon Malcolmnixon requested a review from a team as a code owner March 11, 2023 17:08
Copy link
Contributor

@BastiaanOlij BastiaanOlij left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, support should be added for v-sync when OpenGL is used on Android but that falls outside of the scope of this fix. Someone should probably raise an issue for that.

@clayjohn clayjohn added this to the 4.1 milestone Mar 12, 2023
@clayjohn clayjohn merged commit 550a779 into godotengine:master Mar 12, 2023
@clayjohn
Copy link
Member

Looks great, thanks!

@Malcolmnixon Malcolmnixon deleted the gles3_android branch March 12, 2023 21:42
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants