X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu-gles%2FgpuStdafx.h;h=41051dce976110f5f5cd10d2d63f1d8b824ee142;hp=bc348989e446b21acc4b724b52171892a021b0ff;hb=HEAD;hpb=7eadbf885fc9ebd271fa0d7bce3f27394488b059

diff --git a/plugins/gpu-gles/gpuStdafx.h b/plugins/gpu-gles/gpuStdafx.h
index bc348989..41051dce 100644
--- a/plugins/gpu-gles/gpuStdafx.h
+++ b/plugins/gpu-gles/gpuStdafx.h
@@ -66,21 +66,9 @@ extern "C" {
 #ifdef SOFT_LINKAGE
 #pragma softfp_linkage
 #endif
-#ifdef MAEMO_CHANGES
-
-	//#include <GLES/glplatform.h>
-	#include <GLES/gl.h>
-	//#include <GLES/glext.h>
-	#include <GLES/EGL/egl.h>
-	//#include "../maemo/minimal.h"
-	//#include <gdk/gdkx.h>
-	//#include <gdk/gdk.h>
-
-
-#else
-	#include <gles/gl.h> // for opengl es types 
-	#include <gles/egltypes.h>
-#endif
+#include <GLES/gl.h> // for opengl es types 
+//#include <GLES/egltypes.h>
+#include <EGL/egl.h>
 #ifdef SOFT_LINKAGE
 #pragma no_softfp_linkage
 #endif
@@ -94,10 +82,16 @@ extern "C" {
 #define SHADETEXBIT(x) ((x>>24) & 0x1)
 #define SEMITRANSBIT(x) ((x>>25) & 0x1)
 
-#ifndef _WINDOWS
-#ifndef GL_BGRA_EXT
-#define GL_BGRA_EXT GL_RGBA
-#endif
+#if 0
+#define glError() { \
+       GLenum err = glGetError(); \
+       while (err != GL_NO_ERROR) { \
+               printf("glError: %d caught at %s:%u\n", err, __FILE__, __LINE__); \
+               err = glGetError(); \
+       } \
+}
+#else
+#define glError() 
 #endif
 
 #ifdef __cplusplus