Added round function to gles2 #30895
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
f706633 to
0c4ddab
Compare
|
My only fear with adding more code to the base shaders is that versions will take longer to compile because more needs to be parsed. Maybe having some ifdef around these being used may work? |
0c4ddab to
103eab0
Compare
103eab0 to
3f25dde
Compare
|
Thanks! |
Raphael2048
reviewed
Jul 30, 2019
| @@ -917,6 +928,7 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() { | |||
| actions[VS::SHADER_CANVAS_ITEM].usage_defines["NORMAL"] = "#define NORMAL_USED\n"; | |||
| actions[VS::SHADER_CANVAS_ITEM].usage_defines["NORMALMAP"] = "#define NORMALMAP_USED\n"; | |||
| actions[VS::SHADER_CANVAS_ITEM].usage_defines["LIGHT"] = "#define USE_LIGHT_SHADER_CODE\n"; | |||
| actions[VS::SHADER_CANVAS_ITEM].usage_defines["round"] = "#define ROUND_USED\n"; | |||
There was a problem hiding this comment.
One question about it, why don't add usage_defines for spatial shader here?
There was a problem hiding this comment.
Ah. Good catch. I added just for CanvasItem while testing and then forgot to add to Spatial before comitting.
There was a problem hiding this comment.
This is only for GLES2. So no particle shaders. ;p
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #24850
Implements the
round()function in GLES2. Something similar can be done with a few of the other GLES3-only features found in http://docs.godotengine.org/en/latest/tutorials/misc/gles2_gles3_differences.html#shading-languagePutting this up first to see if this is the implementation we want to follow. Then I will make a PR with a few others.
Implementation Notes:
Right now, I have copied the implementation from the
mix(a, b, bool_type)override. The shader compiler replaces calls toround()with calls toroundx(), which are defined in stdlib.glsl. This implementation works and is safe to use. However it may be unnecessary.An alternative would be to just provide an overloaded
round()function in stdlib.glsl without changing anything in the compiler. This seems to work, but some GLES2 devices that deviate from spec allow users to useround(), so I'm worried that it would crash on those devices. That being said, it is a much more elegant solution.