Merge branch 'master' into epoxy

[movit] / demo.cpp

diff --git a/demo.cpp b/demo.cpp
index 81d3e5091909e5cae8afe2b36fbd6b6addb3edb3..9831b31f082ee39c6f40437bb98825bd6c69c342 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -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>
@@ -35,6 +35,8 @@
 #include "util.h"
 #include "widgets.h"
 
+using namespace movit;
+
 unsigned char result[WIDTH * HEIGHT * 4];
 
 float lift_theta = 0.0f, lift_rad = 0.0f, lift_v = 0.0f;
@@ -176,7 +178,7 @@ int main(int argc, char **argv)
        SDL_SetVideoMode(WIDTH, HEIGHT, 0, SDL_OPENGL);
        SDL_WM_SetCaption("OpenGL window", NULL);
 
-       init_movit(".", MOVIT_DEBUG_ON);
+       CHECK(init_movit(".", MOVIT_DEBUG_ON));
        printf("GPU texture subpixel precision: about %.1f bits\n",
                log2(1.0f / movit_texel_subpixel_precision));
        printf("Wrongly rounded x+0.48 or x+0.52 values: %d/510\n",