gpu-gles: refactor for caanoo/wiz support

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

diff --git a/plugins/gpu-gles/gpuExternals.h b/plugins/gpu-gles/gpuExternals.h
index 977d74d..897b446 100644 (file)
--- a/plugins/gpu-gles/gpuExternals.h
+++ b/plugins/gpu-gles/gpuExternals.h
@@ -33,28 +33,12 @@
 extern "C" {\r
 #endif\r
 \r
-typedef unsigned char u8;\r
-typedef signed char s8;\r
-typedef unsigned short int u16;\r
-typedef signed short int s16;\r
-typedef unsigned long u32;\r
-typedef signed long s32;\r
-typedef unsigned long long int u64;\r
-typedef signed long long int s64;\r
-\r
-#ifndef _WINDOWS\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
@@ -253,7 +237,7 @@ typedef struct OGLVertexTag
  union\r
 COLTAG\r
   {\r
-   u8 col[4];\r
+   unsigned char col[4];\r
    unsigned long lcol;\r
   } c;\r
 \r
@@ -261,13 +245,13 @@ COLTAG
 \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
@@ -295,8 +279,8 @@ extern BOOL           bAdvancedBlend;
 //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
@@ -361,8 +345,8 @@ extern short         sSprite_vy2;
 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
@@ -380,13 +364,17 @@ extern short sxmax;
 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
@@ -424,8 +412,8 @@ extern int            iDataReadMode;
 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
@@ -435,8 +423,8 @@ extern long           lGPUstatusRet;
 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
@@ -481,7 +469,7 @@ extern GLuint         gTexPicName;
 #ifndef _IN_CFG\r
 \r
 #ifndef _WINDOWS\r
-extern s8 * pConfigFile;\r
+extern char * pConfigFile;\r
 #endif\r
 \r
 #endif\r
@@ -503,10 +491,10 @@ extern float          fps_cur;
 //-----------------------------------------------------//\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