Do not send uninitialized memory as a texture.

[movit] / gamma_expansion_effect.cpp

diff --git a/gamma_expansion_effect.cpp b/gamma_expansion_effect.cpp
index 61f0330f1671967cb4f85786085bbf771352b57b..d4e532f8b816f1cf594a0f82ba199f5133f944cb 100644 (file)
--- a/gamma_expansion_effect.cpp
+++ b/gamma_expansion_effect.cpp
@@ -1,3 +1,4 @@
+#include <math.h>
 #include <assert.h>
 
 #include "gamma_expansion_effect.h"
@@ -7,18 +8,37 @@ GammaExpansionEffect::GammaExpansionEffect()
        : source_curve(GAMMA_LINEAR)
 {
        register_int("source_curve", (int *)&source_curve);
+       register_1d_texture("expansion_curve_tex", expansion_curve, EXPANSION_CURVE_SIZE);
 }
 
 std::string GammaExpansionEffect::output_fragment_shader()
 {
-       switch (source_curve) {
-       case GAMMA_LINEAR:
+       if (source_curve == GAMMA_LINEAR) {
                return read_file("identity.frag");
-       case GAMMA_sRGB:
-               return read_file("gamma_expansion_effect_srgb.frag");
-       case GAMMA_REC_709:  // and GAMMA_REC_601
-               return read_file("gamma_expansion_effect_rec709.frag");
-       default:
-               assert(false);
        }
+       if (source_curve == GAMMA_sRGB) {
+               for (unsigned i = 0; i < EXPANSION_CURVE_SIZE; ++i) {
+                       float x = i / (float)(EXPANSION_CURVE_SIZE - 1);
+                       if (x < 0.04045f) {
+                               expansion_curve[i] = (1.0/12.92f) * x;
+                       } else {
+                               expansion_curve[i] = pow((x + 0.055) * (1.0/1.055f), 2.4);
+                       }
+               }
+               invalidate_1d_texture("expansion_curve_tex");
+               return read_file("gamma_expansion_effect.frag");
+       }
+       if (source_curve == GAMMA_REC_709) {  // And Rec. 601.
+               for (unsigned i = 0; i < EXPANSION_CURVE_SIZE; ++i) {
+                       float x = i / (float)(EXPANSION_CURVE_SIZE - 1);
+                       if (x < 0.081f) {
+                               expansion_curve[i] = (1.0/4.5f) * x;
+                       } else {
+                               expansion_curve[i] = pow((x + 0.099) * (1.0/1.099f), 1.0f/0.45f);
+                       }
+               }
+               invalidate_1d_texture("expansion_curve_tex");
+               return read_file("gamma_expansion_effect.frag");
+       }
+       assert(false);
 }