Merge branch 'master' of github.com:lsalzman/tesseract

src/engine/rendergl.cpp

@@ -927,6 +927,8 @@ void printtimers(int conw, int conh)
 
 void gl_init(int w, int h)
 {
+    GLERROR;
+
     glViewport(0, 0, w, h);
     glClearColor(0, 0, 0, 0);
     glClearDepth(1);
@@ -958,6 +960,8 @@ void gl_init(int w, int h)
 
     vieww = w;
     viewh = h;
+
+    GLERROR;
 }
 
 #define VARRAY_INTERNAL
@@ -1797,10 +1801,12 @@ void drawminimap()
 {
     if(!game::needminimap()) { clearminimap(); return; }
 
+    GLERROR;
     renderprogress(0, "generating mini-map...", 0, !renderedframe);
 
     drawtex = DRAWTEX_MINIMAP;
 
+    GLERROR;
     setupframe(screenw, screenh);
 
     int size = 1<<minimapsize, sizelimit = min(hwtexsize, min(vieww, viewh));

src/engine/renderlights.cpp

@@ -3861,6 +3861,7 @@ void shadegbuffer()
 
 void setupframe(int w, int h)
 {
+    GLERROR;
     setupgbuffer(w, h);
     if(hdr && (bloomw < 0 || bloomh < 0)) setupbloom(gw, gh);
     if(ao && (aow < 0 || aoh < 0)) setupao(gw, gh);

src/include/SDL_config_windows.h

@@ -77,7 +77,7 @@ typedef unsigned int uintptr_t;
 #endif
 
 /* Enabled for SDL 1.2 (binary compatibility) */
-//#define HAVE_LIBC     1
+#define HAVE_LIBC     1
 #ifdef HAVE_LIBC
 /* Useful headers */
 #define HAVE_STDIO_H 1