-
-
Notifications
You must be signed in to change notification settings - Fork 21.4k
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 a default shader specular render mode to SCHLICK_GGX
#51155
Conversation
8ccee4c
to
7fb6868
Compare
servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
Outdated
Show resolved
Hide resolved
servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
Outdated
Show resolved
Hide resolved
5cbf8f8
to
c83c279
Compare
I would really prefer to not add so much stuff in the shaders, what was the original problem? |
|
c83c279
to
ef69238
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would be fine with the change as shown, my only remark was that the setting between GGX/BLINN was over kill so I am happy with the current solution to make GGX the default on desktop and BLINN the default on mobile. The check at the top of the shader makes it very clear to anyone reading the code what the desired behavior is.
Do need to make sure this is properly documented.
According to #22637, Blinn could be removed entirely since GGX has the same number of instructions. Maybe Phong should be removed too, I'm not sure. |
ef69238
to
47a6bb2
Compare
@Calinou Ok changed to schilck in both cases. |
SCHLICK_GGX
/BLINN
)SCHLICK_GGX
)
As a note to whoever merges this #46838 is a 3.x issue and should not be closed by this PR. |
SCHLICK_GGX
)SCHLICK_GGX
Thanks! |
Makes shader pipeline use
SPECULAR_SCHLICK_GGX
(desktop) andSPECULAR_BLINN
(mobile) - parameter by default (and if the user didn't definerender_mode
directly).revert #41533
Bugsquad edit: Fixes #46838.