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=12c11c0e615f7fc17ef7a600ff0c9099f7908dbc;p=movit

Merge branch 'master' into epoxy
---

diff --git a/demo.cpp b/demo.cpp
index 9831b31..96864e9 100644
--- 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;