Reintroduce support for chunk $texture2DSAMPLE #4431
Conversation
| return pow(color, vec3(0.45)); | ||
| #endif | ||
| #else | ||
| return pow(color + 0.0000001, vec3(1.0 / 2.2)); |
There was a problem hiding this comment.
doesn't need to be vec3(0.0000001) ?
There was a problem hiding this comment.
nope this works. the float is added to vector components.
|
|
||
| // continue to support $texture2DSAMPLE | ||
| if (subCode.indexOf('$texture2DSAMPLE')) { | ||
| const decodeTable = { |
There was a problem hiding this comment.
keep this object at the global scope?
There was a problem hiding this comment.
I am convinced the compiler does not construct/allocate this object every time the function is called (but rather hoists it globally or something similar - equivalent to c++ const block). Having it declared here where it is used is much clearer for the reader.
Now just need to find some confirmation of my conviction on the webs...
| @@ -371,6 +383,14 @@ const standard = { | |||
| code.append(this._addMap("light", lightmapChunkPropName, options, litShader.chunks, options.lightMapEncoding)); | |||
| func.append("getLightMap();"); | |||
| } | |||
|
|
|||
| // only add the legacy chunk if it's referenced | |||
| if (code.code.indexOf('texture2DSRGB') !== -1 || | |||
There was a problem hiding this comment.
could this be tracked differently than using .indexOf?
Likely not I assume, as any chunk can just call this directly.
There was a problem hiding this comment.
Yeah this is no nasty :`(
Alternatively since only emissive and lightmap chunks do this, we could somehow pass flags around tracking the use of these functions instead. This code is just so much simpler.
We recently removed support for
$texture2DSAMPLE(...)macro in shaders since it's completely unnecessary ( #4405). The way to do this now is:$DECODE(texture2D(...)).However, almost all overridden lightmap and emissive chunks use this macro and so this PR re-introduces the macro to remain backwards compatible.
In the process, we also shuffle
gammaCorrectfunction to use the already-availabledecodeXXXfunctions instead of reimplementing them.