X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=dither_effect.h;h=b1bbbff4168cec94708557c32c2f2f1d93dcef9a;hp=f9f371c0c5f5f2025761164bc386ec42665e7fdf;hb=dff7a05663a3c9c32cf1d75b928fac3ebe384ffd;hpb=ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b

diff --git a/dither_effect.h b/dither_effect.h
index f9f371c..b1bbbff 100644
--- a/dither_effect.h
+++ b/dither_effect.h
@@ -43,11 +43,13 @@
 // like many LCD monitors do, but it starts to get very hairy, again, for limited gains.)
 // The dither is also deterministic across runs.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class DitherEffect : public Effect {
 private:
 	// Should not be instantiated by end users;
@@ -57,15 +59,16 @@ private:
 
 public:
 	~DitherEffect();
-	virtual std::string effect_type_id() const { return "DitherEffect"; }
-	std::string output_fragment_shader();
+	std::string effect_type_id() const override { return "DitherEffect"; }
+	std::string output_fragment_shader() override;
 
 	// Note that if we did error diffusion, we'd actually want to diffuse the
 	// premultiplied error. However, we need to do dithering in the same
 	// space as quantization, whether that be pre- or postmultiply.
-	virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
+	AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; }
+	bool strong_one_to_one_sampling() const override { return true; }
 
-	void set_gl_state(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) override;
 
 private:
 	void update_texture(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
@@ -75,7 +78,11 @@ private:
 	int texture_width, texture_height;
 
 	GLuint texnum;
-	bool need_texture_update;
+	float uniform_round_fac, uniform_inv_round_fac;
+	float uniform_tc_scale[2];
+	GLint uniform_dither_tex;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_DITHER_EFFECT_H)