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

Add compositor_free branch in Compatibility scene renderer free function #88873

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

clayjohn
Copy link
Member

@clayjohn clayjohn commented Feb 26, 2024

Fixes: #88861

See the equivalent code in the other renderers:

} else if (is_compositor(p_rid)) {
compositor_free(p_rid);
return true;

} else if (is_compositor(p_rid)) {
compositor_free(p_rid);

CC @BastiaanOlij

@clayjohn clayjohn added this to the 4.3 milestone Feb 26, 2024
@clayjohn clayjohn requested a review from a team as a code owner February 26, 2024 15:48
@BastiaanOlij
Copy link
Contributor

Looks correct, you probably also need to add:

} else if (is_compositor_effect(p_rid)) {
	compositor_effect_free(p_rid);

It's a bit weird with these (including environment) as their implementation is in the base system but then the free logic is in each renderer.

@clayjohn clayjohn force-pushed the GLES3-compositor-free branch from ce331cd to 57f8b88 Compare February 27, 2024 01:57
@clayjohn
Copy link
Member Author

@BastiaanOlij Done!

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.

lgtm

@akien-mga akien-mga changed the title Add compositor_free branch in Compatibility scene renderer free function Add compositor_free branch in Compatibility scene renderer free function Feb 27, 2024
@akien-mga akien-mga merged commit b38d5ef into godotengine:master Feb 27, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

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.

GL Compatibility preview generation leaks RendererCompositorStorage::Compositor struct on exit
3 participants