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

[movit] / README

diff --git a/README b/README
index 26ceaacf357d66eadd14b6eedf429691716e1e90..c4d14c7b1f335a2d05bd90b00beabd1d87808595 100644 (file)
--- a/README
+++ b/README
@@ -27,6 +27,8 @@ OK, you need
   you're home free.
 * The [Eigen 3] and [Google Test] libraries. (The library itself
   depends only on the former, but you probably want to run the unit tests.)
+* The [GLEW] library, for dealing with OpenGL extensions on various
+  platforms.
 
 Movit has been tested with Intel GPUs with the Mesa drivers
 (you'll probably need at least Mesa 8.0), Radeon 3850 and GeForce GTX 550
@@ -60,7 +62,7 @@ Assuming you have an OpenGL context already set up:
   ImageFormat inout_format;
   inout_format.color_space = COLORSPACE_sRGB;
   inout_format.gamma_curve = GAMMA_sRGB;
-  FlatInput *input = knew FlatInput(inout_format, FORMAT_BGRA, GL_UNSIGNED_BYTE, 1280, 720));
+  FlatInput *input = knew FlatInput(inout_format, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, 1280, 720));
   chain.add_input(input);
 
   Effect *saturation_effect = chain.add_effect(new SaturationEffect());
@@ -70,7 +72,7 @@ Assuming you have an OpenGL context already set up:
   const float gain[] = { 0.8f, 1.0f, 1.0f };
   lift_gamma_gain_effect->set_vec3("gain", &gain);
 
-  chain.add_output(inout_format);
+  chain.add_output(inout_format, OUTPUT_POSTMULTIPLIED_ALPHA);
   chain.finalize();
 
   for ( ;; ) {