Make the ResampleEffect accuracy test stricter.

[movit] / lift_gamma_gain_effect.h

diff --git a/lift_gamma_gain_effect.h b/lift_gamma_gain_effect.h
index b57a89964204fa5622635ac852d8678721a090ce..60978f45047c3272e78662ae31f7c1e4f289eea2 100644 (file)
--- a/lift_gamma_gain_effect.h
+++ b/lift_gamma_gain_effect.h
@@ -1,5 +1,5 @@
-#ifndef _LIFT_GAMMA_GAIN_EFFECT_H
-#define _LIFT_GAMMA_GAIN_EFFECT_H 1
+#ifndef _MOVIT_LIFT_GAMMA_GAIN_EFFECT_H
+#define _MOVIT_LIFT_GAMMA_GAIN_EFFECT_H 1
 
 // A simple lift/gamma/gain effect, used for color grading.
 //
@@ -16,18 +16,26 @@
 // rest of the curve relatively little. Thus, we actually convert to gamma 2.2
 // before lift, and then back again afterwards. (Gain and gamma are,
 // up to constants, commutative with the de-gamma operation.)
+//
+// Also, gamma is a case where we would not want premultiplied alpha.
+// Thus, we have to divide away alpha first, and then re-multiply it back later.
+
+#include <GL/glew.h>
+#include <string>
 
 #include "effect.h"
 
 class LiftGammaGainEffect : public Effect {
 public:
        LiftGammaGainEffect();
+       virtual std::string effect_type_id() const { return "LiftGammaGainEffect"; }
+       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
        std::string output_fragment_shader();
 
-       void set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
 
 private:
        RGBTriplet lift, gamma, gain;
 };
 
-#endif // !defined(_LIFT_GAMMA_GAIN_EFFECT_H)
+#endif // !defined(_MOVIT_LIFT_GAMMA_GAIN_EFFECT_H)