Make effect_id phase-local instead of global.

[movit] / dither_effect.cpp

diff --git a/dither_effect.cpp b/dither_effect.cpp
index 87e729a3c9feca0a7253e7617eeb41d287d9f68b..1554356213ee1ec13815fd0c5581140010d15d74 100644 (file)
--- a/dither_effect.cpp
+++ b/dither_effect.cpp
@@ -1,9 +1,10 @@
-#include <math.h>
+#include <GL/glew.h>
 #include <assert.h>
+#include <algorithm>
 
 #include "dither_effect.h"
+#include "effect_util.h"
 #include "util.h"
-#include "opengl.h"
 
 namespace {
 
@@ -85,6 +86,10 @@ void DitherEffect::set_gl_state(GLuint glsl_program_num, const std::string &pref
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
+       assert(width > 0);
+       assert(height > 0);
+       assert(num_bits > 0);
+
        if (width != last_width || height != last_height || num_bits != last_num_bits) {
                update_texture(glsl_program_num, prefix, sampler_num);
                last_width = width;