OutputShader: Use #include instead of ShaderChunk.
#26990
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
Mugen87
reviewed
Oct 16, 2023
| @@ -35,7 +31,8 @@ const OutputShader = { | |||
|
|
|||
| uniform sampler2D tDiffuse; | |||
|
|
|||
| ` + ShaderChunk[ 'tonemapping_pars_fragment' ] + ShaderChunk[ 'colorspace_pars_fragment' ] + ` | |||
| #include <tonemapping_pars_fragment> | |||
| #include <colorspace_pars_fragment> | |||
There was a problem hiding this comment.
Um, I'm not sure why I have written this differently. I could swear previous versions required the ShaderChunk approach otherwise a GLSL error occurred.
There was a problem hiding this comment.
Probably related to automatically included chunks when tonemapping is configured on the renderer.
three.js/src/renderers/webgl/WebGLProgram.js
Line 810 in bef001a
There was a problem hiding this comment.
Ah, maybe the runtime error occurred because I have used ShaderMaterial at the beginning. I have later switched to RawShaderMaterial and thought includes could not be used.
There was a problem hiding this comment.
Anyway, let's give this a try. It's indeed the cleaner solution.
Mugen87
changed the title
#include instead of ShaderChunk.
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.
Related issue: #XXXX
Description
Minor changes from #26912 which were previously needed for tree-shaking better align with surrounding shader chunk consumption.