Kill the vertex shader system; it is too complicated to get it right until we have...

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 045c9aa7832f7885570eccd69d7670ce39d92e28..3fa62ee3e074c3402843d46f0124ed3599e87ed0 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -6,7 +6,7 @@
 #include "effect.h"
 #include "effect_id.h"
 
-enum PixelFormat { FORMAT_RGB, FORMAT_RGBA };
+enum PixelFormat { FORMAT_RGB, FORMAT_RGBA, FORMAT_BGR, FORMAT_BGRA };
 
 enum ColorSpace {
        COLORSPACE_sRGB = 0,
@@ -53,7 +53,10 @@ private:
        ImageFormat input_format, output_format;
        std::vector<Effect *> effects;
 
-       int glsl_program_num;
+       bool use_srgb_texture_format;
+
+       GLint glsl_program_num;
+       GLenum format, bytes_per_pixel;
        bool finalized;
 
        // Used during the building of the effect chain.