#ifdef __cplusplus\r
extern "C" {\r
#endif\r
-#define _GPU_API_\r
-#ifndef _WINDOWS\r
+\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
-#endif\r
-\r
-#ifdef MAEMO_CHANGES\r
- #include "../psxCommon.h"\r
-#else\r
- #include "psxCommon.h"\r
+#include <GLES/gl.h>\r
+#include <GLES/glext.h>\r
#endif\r
\r
#ifdef __NANOGL__\r
union\r
COLTAG\r
{\r
- u8 col[4];\r
+ unsigned char col[4];\r
unsigned long lcol;\r
} c;\r
\r
\r
typedef union EXShortTag\r
{\r
- u8 c[2];\r
+ unsigned char c[2];\r
unsigned short s;\r
} EXShort;\r
\r
typedef union EXLongTag\r
{\r
- u8 c[4];\r
+ unsigned char c[4];\r
unsigned long l;\r
EXShort s[2];\r
} EXLong;\r
//extern PFNGLBLENDEQU glBlendEquationEXTEx;\r
//extern PFNGLCOLORTABLEEXT glColorTableEXTEx;\r
\r
-extern u8 gl_ux[8];\r
-extern u8 gl_vy[8];\r
+extern unsigned char gl_ux[8];\r
+extern unsigned char gl_vy[8];\r
extern OGLVertex vertex[4];\r
extern short sprtY,sprtX,sprtH,sprtW;\r
#ifdef _WINDOWS\r
extern BOOL bRenderFrontBuffer;\r
extern unsigned long ulOLDCOL;\r
extern unsigned long ulClutID;\r
-extern void (*primTableJ[256])(u8 *);\r
-extern void (*primTableSkip[256])(u8 *);\r
+extern void (*primTableJ[256])(unsigned char *);\r
+extern void (*primTableSkip[256])(unsigned char *);\r
extern unsigned short usMirror;\r
extern unsigned long dwCfgFixes;\r
extern unsigned long dwActFixes;\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
\r
#ifndef _IN_TEXTURE\r
\r
-extern u8 ubOpaqueDraw;\r
+extern unsigned char ubOpaqueDraw;\r
extern GLint giWantedRGBA;\r
extern GLint giWantedFMT;\r
extern GLint giWantedTYPE;\r
extern int iColDepth;\r
extern BOOL bChangeRes;\r
extern BOOL bWindowMode;\r
-extern s8 szDispBuf[];\r
-extern s8 szGPUKeys[];\r
+extern char szDispBuf[];\r
+extern char szGPUKeys[];\r
extern PSXDisplay_t PSXDisplay;\r
extern PSXDisplay_t PreviousPSXDisplay;\r
//extern unsigned long ulKeybits;\r
extern short imageX0,imageX1;\r
extern short imageY0,imageY1;\r
extern long lClearOnSwap,lClearOnSwapColor;\r
-extern u8 * psxVub;\r
-extern s8 * psxVsb;\r
+extern unsigned char * psxVub;\r
+extern char * psxVsb;\r
extern unsigned short * psxVuw;\r
extern signed short * psxVsw;\r
extern unsigned long * psxVul;\r
#ifndef _IN_CFG\r
\r
#ifndef _WINDOWS\r
-extern s8 * pConfigFile;\r
+extern char * pConfigFile;\r
#endif\r
\r
#endif\r
//-----------------------------------------------------//\r
\r
typedef struct {\r
-u8 r;\r
-u8 g;\r
-u8 b;\r
-u8 a;\r
+unsigned char r;\r
+unsigned char g;\r
+unsigned char b;\r
+unsigned char a;\r
} Vec4f;\r
\r
/**/\r
int x;\r
int y;\r
} Vec2f;\r
-/**/\r
+*/\r
\r
typedef struct {\r
Vec3f xyz;\r