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

GLES3: Fix iOS Simulator by removing incorrect system_fbo overwrite #84955

Merged
merged 1 commit into from
Nov 16, 2023

Conversation

kisg
Copy link
Contributor

@kisg kisg commented Nov 16, 2023

The system_fbo static field is already initialized to zero, it should not be initialized again, when a TextureStorage instance is created, because it interferes with the iOS OpenGL initialization (see platform/ios/display_layer.mm).

This change fixes the OpenGL backend for the iOS Simulator and iOS devices.

Developed by Migeran, sponsored by Smirk Software.

Fixes #82917

@kisg kisg requested a review from a team as a code owner November 16, 2023 01:08
@kisg kisg changed the title Fix iOS Simulator by Removing Incorrect system_fbo Overwrite Fix iOS Simulator by removing incorrect system_fbo overwrite Nov 16, 2023
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 makes perfect sense

@bruvzg bruvzg added this to the 4.2 milestone Nov 16, 2023
@akien-mga akien-mga changed the title Fix iOS Simulator by removing incorrect system_fbo overwrite Fix iOS Simulator by removing incorrect system_fbo overwrite Nov 16, 2023
@akien-mga akien-mga merged commit ce9901e into godotengine:master Nov 16, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Nov 16, 2023
@akien-mga akien-mga changed the title Fix iOS Simulator by removing incorrect system_fbo overwrite GLES3: Fix iOS Simulator by removing incorrect system_fbo overwrite Nov 17, 2023
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jan 23, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.4.

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