summaryrefslogtreecommitdiff
path: root/src/render/shaders/glsl/cm_helpers.glsl
diff options
context:
space:
mode:
authorUjinT34 <41110182+UjinT34@users.noreply.github.com>2026-04-16 21:19:25 +0300
committerGitHub <noreply@github.com>2026-04-16 19:19:25 +0100
commit66ea2e2c9ed4e9257521e6706fbd21feb7e3cc5b (patch)
tree6c0c9842245917e9828874263cd11d6f556a0a48 /src/render/shaders/glsl/cm_helpers.glsl
parent4cce7f60a9c8772d18ffb43cb74aa227ab4b3bc4 (diff)
renderer: Various CM fixes, part 8 of refactors (#13860)
Part 8 of Ujin's refactors.
Diffstat (limited to 'src/render/shaders/glsl/cm_helpers.glsl')
-rw-r--r--src/render/shaders/glsl/cm_helpers.glsl14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/render/shaders/glsl/cm_helpers.glsl b/src/render/shaders/glsl/cm_helpers.glsl
index 472c6ea5..0d8c68e9 100644
--- a/src/render/shaders/glsl/cm_helpers.glsl
+++ b/src/render/shaders/glsl/cm_helpers.glsl
@@ -189,14 +189,10 @@ vec4 fromLinear(vec4 color, int tf) {
}
vec4 fromLinearNit(vec4 color, int tf, vec2 range) {
- if (tf == CM_TRANSFER_FUNCTION_EXT_LINEAR)
- color.rgb = color.rgb / SDR_MAX_LUMINANCE;
- else {
- color.rgb /= max(color.a, 0.001);
- color.rgb = (color.rgb - range[0]) / (range[1] - range[0]);
- color.rgb = fromLinearRGB(color.rgb, tf);
- color.rgb *= color.a;
- }
+ color.rgb = (color.rgb - range[0] * color.a) / (range[1] - range[0]); // @gulafaran
+ color.rgb /= max(color.a, 0.001);
+ color.rgb = fromLinearRGB(color.rgb, tf);
+ color.rgb *= color.a;
return color;
}
@@ -242,7 +238,7 @@ vec4
#endif
#if USE_MIRROR
// TODO HDR -> SDR tonemap
- vec4 mirrorColor = fromLinearNit(pixColor, CM_TRANSFER_FUNCTION_GAMMA22,
+ vec4 mirrorColor = fromLinearNit(pixColor, CM_TRANSFER_FUNCTION_SRGB,
srcTF == CM_TRANSFER_FUNCTION_GAMMA22 || srcTF == CM_TRANSFER_FUNCTION_SRGB ? srcTFRange : vec2(SDR_MIN_LUMINANCE, SDR_MAX_LUMINANCE));
#endif
pixColor = fromLinearNit(pixColor, dstTF, dstTFRange);