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

[3.x] Fix multiple ubershader bugs #64096

Merged
merged 3 commits into from
Aug 8, 2022

Conversation

RandomShaper
Copy link
Member

I've kept the fixes in separate commits, since each one addresses one specific issue, and I believe this way is better to convey information to future maintainers.

  • Fix shadow flickering with async shader compilation
    This mostly reverts the approach in [3.5] Avoid GL undefined behavior in ubershaders #62628, which now the problem is better scoped, looks overengineered and instead focuses on the few cases where there's something to take care of.
  • Fix emission not working in the ubershader
  • Fix GI probes not working in the ubershader

Fixes #63346.
Fixes #64040.

This mostly reverts the approach in godotengine#62628, which now the problem is better scoped, looks overengineered and instead focuses on the few cases where there's something to take care of.
@RandomShaper RandomShaper added bug topic:rendering cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels Aug 8, 2022
@RandomShaper RandomShaper added this to the 3.x milestone Aug 8, 2022
@RandomShaper RandomShaper requested a review from clayjohn August 8, 2022 08:53
@RandomShaper RandomShaper requested review from a team as code owners August 8, 2022 08:53
@akien-mga akien-mga modified the milestones: 3.x, 3.6 Aug 8, 2022
@akien-mga akien-mga merged commit 05f83b3 into godotengine:3.x Aug 8, 2022
@akien-mga
Copy link
Member

Thanks!

@akien-mga
Copy link
Member

Cherry-picked for 3.5.1.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Aug 8, 2022
@RandomShaper RandomShaper deleted the fix_uberflicker_3.x branch August 8, 2022 14:53
@Zireael07
Copy link
Contributor

Does this also fix #64038 (the exposure flickering issue I mentioned)?

@RandomShaper
Copy link
Member Author

Good question. I didn't test, but it may... Sadly, I have no time for testing it now.

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