X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=gamma_expansion_effect.frag;h=051d2faf1042cc47e0be4b3b715dba67c0333794;hp=473365627011a4a265922a0dd0fd863b2bd7f7a4;hb=6f1efa8348a90a393187c12d70fd10d81bbd2c99;hpb=3bb4d84f2c3914ac815b1c3fbcdea0439aa30d74

diff --git a/gamma_expansion_effect.frag b/gamma_expansion_effect.frag
index 4733656..051d2fa 100644
--- a/gamma_expansion_effect.frag
+++ b/gamma_expansion_effect.frag
@@ -1,11 +1,20 @@
 // Expand gamma curve.
 
+// Implicit uniforms:
+// uniform float PREFIX(linear_scale);
+// uniform float PREFIX(c0), PREFIX(c1), PREFIX(c2), PREFIX(c3), PREFIX(c4);
+// uniform float PREFIX(beta);
+
 vec4 FUNCNAME(vec2 tc) {
 	vec4 x = INPUT(tc);
 
-	x.r = texture1D(PREFIX(expansion_curve_tex), x.r).x;
-	x.g = texture1D(PREFIX(expansion_curve_tex), x.g).x;
-	x.b = texture1D(PREFIX(expansion_curve_tex), x.b).x;
+	vec3 a = x.rgb * PREFIX(linear_scale);
+
+	// Fourth-order polynomial approximation to pow(). See the .cpp file for details.
+	vec3 b = PREFIX(c0) + (PREFIX(c1) + (PREFIX(c2) + (PREFIX(c3) + PREFIX(c4) * x.rgb) * x.rgb) * x.rgb) * x.rgb;
+
+	vec3 f = vec3(greaterThan(x.rgb, vec3(PREFIX(beta))));
+	x = vec4(mix(a, b, f), x.a);
 
 	return x;
 }