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
psx_gpu: fix interlace mode
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpuExternals.h
diff --git
a/plugins/gpu-gles/gpuExternals.h
b/plugins/gpu-gles/gpuExternals.h
index
8d30814
..
897b446
100644
(file)
--- a/
plugins/gpu-gles/gpuExternals.h
+++ b/
plugins/gpu-gles/gpuExternals.h
@@
-33,19
+33,12
@@
extern "C" {
\r
#endif
\r
\r
extern "C" {
\r
#endif
\r
\r
-#ifndef _WINDOWS
\r
#ifdef __NANOGL__
\r
#include <gl/gl.h>
\r
#include <gl/egl.h>
\r
#else
\r
#ifdef __NANOGL__
\r
#include <gl/gl.h>
\r
#include <gl/egl.h>
\r
#else
\r
-#ifdef SOFT_LINKAGE
\r
-#pragma softfp_linkage
\r
-#endif
\r
-#include <GLES/gl.h> // for opengl es types
\r
-#ifdef SOFT_LINKAGE
\r
-#pragma no_softfp_linkage
\r
-#endif
\r
-#endif
\r
+#include <GLES/gl.h>
\r
+#include <GLES/glext.h>
\r
#endif
\r
\r
#ifdef __NANOGL__
\r
#endif
\r
\r
#ifdef __NANOGL__
\r
@@
-371,6
+364,10
@@
extern short sxmax;
extern short symin;
\r
extern short symax;
\r
\r
extern short symin;
\r
extern short symax;
\r
\r
+extern unsigned int CSVERTEX;
\r
+extern unsigned int CSCOLOR;
\r
+extern unsigned int CSTEXTURE;
\r
+
\r
#endif
\r
\r
//-----------------------------------------------------//
\r
#endif
\r
\r
//-----------------------------------------------------//
\r