Merge branch 'master' into epoxy

diff --git a/demo.cpp b/demo.cpp
index 9831b31f082ee39c6f40437bb98825bd6c69c342..96864e905e39ef016c5e36326b3aec4939d34250 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -197,6 +197,13 @@ int main(int argc, char **argv)
        EffectChain chain(WIDTH, HEIGHT);
        glViewport(0, 0, WIDTH, HEIGHT);
 
+       glMatrixMode(GL_PROJECTION);
+       glLoadIdentity();
+       glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0);
+
+       glMatrixMode(GL_MODELVIEW);
+       glLoadIdentity();
+
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_sRGB;
        inout_format.gamma_curve = GAMMA_sRGB;