X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu-gles%2FgpuExternals.h;h=897b4467c70780c26e6051e6a3ab751cf1531feb;hp=f24c31ad1e6fba349adbc223a13d4cf2daebf114;hb=6f6fe96900374d8744473ce240279e66d1260191;hpb=ce879073e4f228deec8bec5db8a2ff640636c88f

diff --git a/plugins/gpu-gles/gpuExternals.h b/plugins/gpu-gles/gpuExternals.h
index f24c31ad..897b4467 100644
--- a/plugins/gpu-gles/gpuExternals.h
+++ b/plugins/gpu-gles/gpuExternals.h
@@ -32,26 +32,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#define _GPU_API_
-#ifndef _WINDOWS
+
 #ifdef __NANOGL__
 #include <gl/gl.h>
 #include <gl/egl.h>
 #else
-#ifdef SOFT_LINKAGE
-#pragma softfp_linkage
-#endif
-#include <gles/gl.h> // for opengl es types 
-#ifdef SOFT_LINKAGE
-#pragma no_softfp_linkage
-#endif
-#endif
-#endif
-
-#ifdef MAEMO_CHANGES
-	#include "../psxCommon.h"
-#else
-	#include "psxCommon.h"
+#include <GLES/gl.h>
+#include <GLES/glext.h>
 #endif
 
 #ifdef __NANOGL__
@@ -250,7 +237,7 @@ typedef struct OGLVertexTag
  union
 COLTAG
   {
-   u8 col[4];
+   unsigned char col[4];
    unsigned long lcol;
   } c;
 
@@ -258,13 +245,13 @@ COLTAG
 
 typedef union EXShortTag
 {
- u8  c[2];
+ unsigned char  c[2];
  unsigned short s;
 } EXShort;
 
 typedef union EXLongTag
 {
- u8 c[4];
+ unsigned char c[4];
  unsigned long l;
  EXShort       s[2];
 } EXLong;
@@ -292,8 +279,8 @@ extern BOOL           bAdvancedBlend;
 //extern PFNGLBLENDEQU      glBlendEquationEXTEx;
 //extern PFNGLCOLORTABLEEXT glColorTableEXTEx;
 
-extern u8  gl_ux[8];
-extern u8  gl_vy[8];
+extern unsigned char  gl_ux[8];
+extern unsigned char  gl_vy[8];
 extern OGLVertex      vertex[4];
 extern short          sprtY,sprtX,sprtH,sprtW;
 #ifdef _WINDOWS
@@ -358,8 +345,8 @@ extern short         sSprite_vy2;
 extern BOOL          bRenderFrontBuffer;
 extern unsigned long ulOLDCOL;
 extern unsigned long ulClutID;
-extern void (*primTableJ[256])(u8 *);
-extern void (*primTableSkip[256])(u8 *);
+extern void (*primTableJ[256])(unsigned char *);
+extern void (*primTableSkip[256])(unsigned char *);
 extern unsigned short  usMirror;
 extern unsigned long dwCfgFixes;
 extern unsigned long dwActFixes;
@@ -377,13 +364,17 @@ extern short sxmax;
 extern short symin;
 extern short symax;
 
+extern unsigned int CSVERTEX;
+extern unsigned int CSCOLOR;
+extern unsigned int CSTEXTURE;
+
 #endif
 
 //-----------------------------------------------------//
 
 #ifndef _IN_TEXTURE
 
-extern u8  ubOpaqueDraw;
+extern unsigned char  ubOpaqueDraw;
 extern GLint          giWantedRGBA;
 extern GLint          giWantedFMT;
 extern GLint          giWantedTYPE;
@@ -421,8 +412,8 @@ extern int            iDataReadMode;
 extern int            iColDepth;
 extern BOOL           bChangeRes;
 extern BOOL           bWindowMode;
-extern s8           szDispBuf[];
-extern s8           szGPUKeys[];
+extern char           szDispBuf[];
+extern char           szGPUKeys[];
 extern PSXDisplay_t   PSXDisplay;
 extern PSXDisplay_t   PreviousPSXDisplay;
 //extern unsigned long  ulKeybits;
@@ -432,8 +423,8 @@ extern long           lGPUstatusRet;
 extern short          imageX0,imageX1;
 extern short          imageY0,imageY1;
 extern long           lClearOnSwap,lClearOnSwapColor;
-extern u8  * psxVub;
-extern s8    * psxVsb;
+extern unsigned char  * psxVub;
+extern char    * psxVsb;
 extern unsigned short * psxVuw;
 extern signed short   * psxVsw;
 extern unsigned long  * psxVul;
@@ -478,7 +469,7 @@ extern GLuint         gTexPicName;
 #ifndef _IN_CFG
 
 #ifndef _WINDOWS
-extern s8 * pConfigFile;
+extern char * pConfigFile;
 #endif
 
 #endif
@@ -500,10 +491,10 @@ extern float          fps_cur;
 //-----------------------------------------------------//
 
 typedef struct {
-u8 r;
-u8 g;
-u8 b;
-u8 a;
+unsigned char r;
+unsigned char g;
+unsigned char b;
+unsigned char a;
 } Vec4f;
 
 /**/
@@ -529,7 +520,7 @@ typedef struct {
 int x;
 int y;
 } Vec2f;
-/**/
+*/
 
 typedef struct {
   Vec3f xyz;