Merge branch 'enhancement'

[pcsx_rearmed.git] / plugins / gpu-gles / gpuStdafx.h

diff --git a/plugins/gpu-gles/gpuStdafx.h b/plugins/gpu-gles/gpuStdafx.h
index bc34898..69050b3 100644 (file)
--- a/plugins/gpu-gles/gpuStdafx.h
+++ b/plugins/gpu-gles/gpuStdafx.h
@@ -66,21 +66,9 @@ extern "C" {
 #ifdef SOFT_LINKAGE\r
 #pragma softfp_linkage\r
 #endif\r
-#ifdef MAEMO_CHANGES\r
-\r
-       //#include <GLES/glplatform.h>\r
-       #include <GLES/gl.h>\r
-       //#include <GLES/glext.h>\r
-       #include <GLES/EGL/egl.h>\r
-       //#include "../maemo/minimal.h"\r
-       //#include <gdk/gdkx.h>\r
-       //#include <gdk/gdk.h>\r
-\r
-\r
-#else\r
-       #include <gles/gl.h> // for opengl es types \r
-       #include <gles/egltypes.h>\r
-#endif\r
+#include <GLES/gl.h> // for opengl es types \r
+//#include <GLES/egltypes.h>\r
+#include <EGL/egl.h>\r
 #ifdef SOFT_LINKAGE\r
 #pragma no_softfp_linkage\r
 #endif\r
@@ -100,6 +88,18 @@ extern "C" {
 #endif\r
 #endif\r
 \r
+#if 0\r
+#define glError() { \\r
+       GLenum err = glGetError(); \\r
+       while (err != GL_NO_ERROR) { \\r
+               printf("glError: %d caught at %s:%u\n", err, __FILE__, __LINE__); \\r
+               err = glGetError(); \\r
+       } \\r
+}\r
+#else\r
+#define glError() \r
+#endif\r
+\r
 #ifdef __cplusplus\r
 }\r
 #endif\r