Revert all the changes in demo.cpp that were never supposed to be there in the last...

[movit] / gamma_compression_effect.h

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index ec2a77a64ae1441f08ef6bb93207f27a904507fa..0155ee54b32fb28313d22785d91497e7f40a08c8 100644 (file)
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -1,16 +1,32 @@
 #ifndef _GAMMA_COMPRESSION_EFFECT_H 
 #define _GAMMA_COMPRESSION_EFFECT_H 1
 
+// An effect to convert linear light to the given gamma curve,
+// typically inserted by the framework automatically at the end
+// of the processing chain.
+//
+// Currently supports sRGB and Rec. 601/709.
+
 #include "effect.h"
 #include "effect_chain.h"
 
+#define COMPRESSION_CURVE_SIZE 4096
+
 class GammaCompressionEffect : public Effect {
 public:
        GammaCompressionEffect();
-       std::string output_glsl();
+       virtual std::string effect_type_id() const { return "GammaCompressionEffect"; }
+       std::string output_fragment_shader();
+
+       virtual bool needs_srgb_primaries() const { return false; }
+
+       // Actually needs postmultiplied input as well as outputting it.
+       // EffectChain will take care of that.
+       virtual AlphaHandling alpha_handling() const { return OUTPUT_ALPHA_POSTMULTIPLIED; }
 
 private:
        GammaCurve destination_curve;
+       float compression_curve[COMPRESSION_CURVE_SIZE];
 };
 
 #endif // !defined(_GAMMA_COMPRESSION_EFFECT_H)