From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 9 Mar 2014 11:37:35 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~44
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8ea03db1932e4a76f457e0ecdfe31a4c8be0e0eb;hp=-c;p=movit

Merge branch 'master' into epoxy
---

8ea03db1932e4a76f457e0ecdfe31a4c8be0e0eb
diff --combined demo.cpp
index 9831b31,845a776..96864e9
--- a/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;