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] Avoid freeing proxy textures clearing owner's data #82430

Merged
merged 1 commit into from
Oct 26, 2023

Conversation

RandomShaper
Copy link
Member

This helps with the error message in #79286 (ERROR: Condition "!texture_allocs_cache.has(p_id)" is true.). However, it doesn't fix the crash. All in all, I'm not familiar enough with this at the moment, so please review carefully.

@RandomShaper RandomShaper added this to the 4.2 milestone Sep 27, 2023
@RandomShaper RandomShaper requested a review from a team as a code owner September 27, 2023 08:37
@RandomShaper RandomShaper force-pushed the fix_gles3_tex_free branch 2 times, most recently from 4f9b961 to 06b98a5 Compare September 27, 2023 08:43
@akien-mga akien-mga changed the title Fix unintended dev-only assignment in mesh baking [GLES3] Avoid freeing proxy textures clearing onwer's data Sep 27, 2023
Copy link
Member

@clayjohn clayjohn 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 correct even if it wasn't the cause of the crash.

@clayjohn clayjohn added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Oct 26, 2023
@akien-mga akien-mga merged commit 253711e into godotengine:master Oct 26, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@RandomShaper RandomShaper deleted the fix_gles3_tex_free branch October 26, 2023 15:21
@akien-mga akien-mga changed the title [GLES3] Avoid freeing proxy textures clearing onwer's data [GLES3] Avoid freeing proxy textures clearing owner's data Oct 31, 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
Development

Successfully merging this pull request may close these issues.

4 participants