notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ASFLAGS for rpi2 platform
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpuStdafx.h
diff --git
a/plugins/gpu-gles/gpuStdafx.h
b/plugins/gpu-gles/gpuStdafx.h
index
fc7ee3d
..
41051dc
100644
(file)
--- a/
plugins/gpu-gles/gpuStdafx.h
+++ b/
plugins/gpu-gles/gpuStdafx.h
@@
-31,7
+31,9
@@
extern "C" {
\r
#endif
\r
\r
extern "C" {
\r
#endif
\r
\r
-
\r
+#ifndef _GPU_API_
\r
+#define _GPU_API_ 1
\r
+#endif
\r
\r
\r
\r
\r
\r
\r
@@
-64,15
+66,9
@@
extern "C" {
#ifdef SOFT_LINKAGE
\r
#pragma softfp_linkage
\r
#endif
\r
#ifdef SOFT_LINKAGE
\r
#pragma softfp_linkage
\r
#endif
\r
-#ifdef MAEMO_CHANGES
\r
- #include <GLES/glplatform.h>
\r
- #include <GLES/gl.h>
\r
- #include <GLES/glext.h>
\r
- #include <EGL/egl.h>
\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
#ifdef SOFT_LINKAGE
\r
#pragma no_softfp_linkage
\r
#endif
\r
@@
-86,10
+82,16
@@
extern "C" {
#define SHADETEXBIT(x) ((x>>24) & 0x1)
\r
#define SEMITRANSBIT(x) ((x>>25) & 0x1)
\r
\r
#define SHADETEXBIT(x) ((x>>24) & 0x1)
\r
#define SEMITRANSBIT(x) ((x>>25) & 0x1)
\r
\r
-#ifndef _WINDOWS
\r
-#ifndef GL_BGRA_EXT
\r
-#define GL_BGRA_EXT GL_RGBA
\r
-#endif
\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
#endif
\r
\r
#ifdef __cplusplus
\r