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 FOG shader issue in Compatibility mode #94564

Merged
merged 1 commit into from
Jul 23, 2024

Conversation

rothej
Copy link
Contributor

@rothej rothej commented Jul 20, 2024

Removing #ifndef DISABLE_FOG from two places to fix shader issues in Compatibility mode. Additionally, removing if (scene_data.fog_enabled) from the same, as the shader will not function properly in compatibility mode otherwise. Manually setting fog_enabled to true breaks the shader in a different way, implying that fog_enabled should not need to be true for this shader to function in compatibility mode.

@rothej rothej requested a review from a team as a code owner July 20, 2024 22:02
@akien-mga akien-mga added this to the 4.x milestone Jul 20, 2024
Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

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

Tested locally, it works as expected.

While testing, I found another bug: #94567

@akien-mga akien-mga changed the title Fixing shader issue in Compatibility mode Fix FOG shader issue in Compatibility mode Jul 21, 2024
@akien-mga akien-mga requested a review from clayjohn July 22, 2024 11:26
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.

Looks great!

@clayjohn clayjohn modified the milestones: 4.x, 4.3 Jul 22, 2024
@akien-mga akien-mga added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Jul 23, 2024
@akien-mga akien-mga merged commit 6a79d84 into godotengine:master Jul 23, 2024
18 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
Labels
bug cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release topic:rendering topic:shaders
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FOG writing in shaders fails with Compatibility renderer unless enabled via WorldEnvironment
4 participants