Merge branch 'master' into epoxy

diff --combined demo.cpp
index 9831b31f082ee39c6f40437bb98825bd6c69c342,845a776d20859b67f829ed69e5070d59cf509132..96864e905e39ef016c5e36326b3aec4939d34250
--- 1/demo.cpp
--- 2/demo.cpp
+++ b/demo.cpp
@@@ -4,7 -4,7 +4,7 @@@
  #define WIDTH 1280
  #define HEIGHT 720
  
 -#include <GL/glew.h>
 +#include <epoxy/gl.h>
  #include <SDL/SDL.h>
  #include <SDL/SDL_error.h>
  #include <SDL/SDL_events.h>
@@@ -197,6 -197,13 +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;