gpu-gles: clean up headers and stuff

[pcsx_rearmed.git] / plugins / gpu-gles / gpuPrim.c

diff --git a/plugins/gpu-gles/gpuPrim.c b/plugins/gpu-gles/gpuPrim.c
index 9b718a5..7772dba 100644 (file)
--- a/plugins/gpu-gles/gpuPrim.c
+++ b/plugins/gpu-gles/gpuPrim.c
@@ -53,10 +53,10 @@
 // globals\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-#ifndef _WINDOWS\r
-EGLSurface surface;\r
-EGLDisplay display;\r
-#endif\r
+//#ifndef _WINDOWS\r
+//EGLSurface surface;\r
+//EGLDisplay display;\r
+//#endif\r
 \r
 BOOL           bDrawTextured;                          // current active drawing states\r
 BOOL           bDrawSmoothShaded;\r
@@ -1514,7 +1514,7 @@ void PrepareFullScreenUpload (long Position)
 ////////////////////////////////////////////////////////////////////////\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-u8 * LoadDirectMovieFast(void);\r
+unsigned char * LoadDirectMovieFast(void);\r
 \r
 void UploadScreenEx(long Position)\r
 {\r
@@ -1745,7 +1745,7 @@ BOOL IsInsideNextScreen(short x, short y, short xoff, short yoff)
 //Mask1    Set mask bit while drawing. 1 = on\r
 //Mask2    Do not draw to mask areas. 1= on\r
 \r
-void cmdSTP(u8 * baseAddr)\r
+void cmdSTP(unsigned char * baseAddr)\r
 {\r
  unsigned long gdata = ((unsigned long*)baseAddr)[0];\r
 \r
@@ -1778,7 +1778,7 @@ void cmdSTP(u8 * baseAddr)
 // cmd: Set texture page infos\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void cmdTexturePage(u8 * baseAddr)\r
+void cmdTexturePage(unsigned char * baseAddr)\r
 {\r
  unsigned long gdata = ((unsigned long*)baseAddr)[0];\r
  UpdateGlobalTP((unsigned short)gdata);\r
@@ -1789,7 +1789,7 @@ void cmdTexturePage(u8 * baseAddr)
 // cmd: turn on/off texture window\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void cmdTextureWindow(u8 *baseAddr)\r
+void cmdTextureWindow(unsigned char *baseAddr)\r
 {\r
  unsigned long gdata = ((unsigned long*)baseAddr)[0];\r
 \r
@@ -1998,7 +1998,7 @@ void ClampToPSXScreenOffset(short *x0, short *y0, short *x1, short *y1)
 // cmd: start of drawing area... primitives will be clipped inside\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void cmdDrawAreaStart(u8 * baseAddr)\r
+void cmdDrawAreaStart(unsigned char * baseAddr)\r
 {\r
  unsigned long gdata = ((unsigned long*)baseAddr)[0];\r
 \r
@@ -2029,7 +2029,7 @@ void cmdDrawAreaStart(u8 * baseAddr)
 // cmd: end of drawing area... primitives will be clipped inside\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void cmdDrawAreaEnd(u8 * baseAddr)\r
+void cmdDrawAreaEnd(unsigned char * baseAddr)\r
 {\r
  unsigned long gdata = ((unsigned long*)baseAddr)[0];\r
 \r
@@ -2064,7 +2064,7 @@ void cmdDrawAreaEnd(u8 * baseAddr)
 // cmd: draw offset... will be added to prim coords\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void cmdDrawOffset(u8 * baseAddr)\r
+void cmdDrawOffset(unsigned char * baseAddr)\r
 {\r
  unsigned long gdata = ((unsigned long*)baseAddr)[0];\r
 \r
@@ -2095,7 +2095,7 @@ void cmdDrawOffset(u8 * baseAddr)
 // cmd: load image to vram\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primLoadImage(u8 * baseAddr)\r
+void primLoadImage(unsigned char * baseAddr)\r
 {\r
  unsigned short *sgpuData = ((unsigned short *) baseAddr);\r
 \r
@@ -2252,7 +2252,7 @@ void CheckWriteUpdate()
 // cmd: vram -> psx mem\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primStoreImage(u8 * baseAddr)\r
+void primStoreImage(unsigned char * baseAddr)\r
 {\r
  unsigned short *sgpuData = ((unsigned short *) baseAddr);\r
 \r
@@ -2274,7 +2274,7 @@ void primStoreImage(u8 * baseAddr)
 // cmd: blkfill - NO primitive! Doesn't care about draw areas...\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primBlkFill(u8 * baseAddr)\r
+void primBlkFill(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -2471,7 +2471,7 @@ void MoveImageWrapped(short imageX0,short imageY0,
 \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primMoveImage(u8 * baseAddr)\r
+void primMoveImage(unsigned char * baseAddr)\r
 {\r
  short *sgpuData = ((short *) baseAddr);\r
  short imageY0,imageX0,imageY1,imageX1,imageSX,imageSY,i,j;\r
@@ -2630,7 +2630,7 @@ void primMoveImage(u8 * baseAddr)
 // cmd: draw free-size Tile \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primTileS(u8 * baseAddr)\r
+void primTileS(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long*)baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -2695,7 +2695,7 @@ void primTileS(u8 * baseAddr)
 // cmd: draw 1 dot Tile (point)\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primTile1(u8 * baseAddr)\r
+void primTile1(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long*)baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -2742,7 +2742,7 @@ void primTile1(u8 * baseAddr)
 // cmd: draw 8 dot Tile (small rect)\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primTile8(u8 * baseAddr)\r
+void primTile8(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long*)baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -2789,7 +2789,7 @@ void primTile8(u8 * baseAddr)
 // cmd: draw 16 dot Tile (medium rect)\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primTile16(u8 * baseAddr)\r
+void primTile16(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long*)baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -2900,7 +2900,7 @@ void DrawMultiFilterSprite(void)
 // cmd: small sprite (textured rect)\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primSprt8(u8 * baseAddr)\r
+void primSprt8(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -3021,7 +3021,7 @@ void primSprt8(u8 * baseAddr)
 // cmd: medium sprite (textured rect)\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primSprt16(u8 * baseAddr)\r
+void primSprt16(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -3141,7 +3141,7 @@ void primSprt16(u8 * baseAddr)
 // cmd: free-size sprite (textured rect)\r
 ////////////////////////////////////////////////////////////////////////\r
  \r
-void primSprtSRest(u8 * baseAddr,unsigned short type)\r
+void primSprtSRest(unsigned char * baseAddr,unsigned short type)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -3312,7 +3312,7 @@ void primSprtSRest(u8 * baseAddr,unsigned short type)
   }\r
 }\r
 \r
-void primSprtS(u8 * baseAddr)\r
+void primSprtS(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -3451,7 +3451,7 @@ void primSprtS(u8 * baseAddr)
 // cmd: flat shaded Poly4\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyF4(u8 *baseAddr)\r
+void primPolyF4(unsigned char *baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -3496,7 +3496,7 @@ void primPolyF4(u8 *baseAddr)
 // cmd: smooth shaded Poly4\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyG4(u8 * baseAddr);\r
+void primPolyG4(unsigned char * baseAddr);\r
 \r
 BOOL bDrawOffscreenFrontFF9G4(void)\r
 {\r
@@ -3519,9 +3519,9 @@ BOOL bDrawOffscreenFrontFF9G4(void)
  return TRUE;\r
 }\r
 \r
-BOOL bCheckFF9G4(u8 * baseAddr)\r
+BOOL bCheckFF9G4(unsigned char * baseAddr)\r
 {\r
- static u8 pFF9G4Cache[32];\r
+ static unsigned char pFF9G4Cache[32];\r
  static int iFF9Fix=0;\r
 \r
  if(baseAddr)\r
@@ -3560,7 +3560,7 @@ BOOL bCheckFF9G4(u8 * baseAddr)
 \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyG4(u8 * baseAddr)\r
+void primPolyG4(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = (unsigned long *)baseAddr;\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -3778,7 +3778,7 @@ BOOL DoLineCheck(unsigned long * gpuData)
 \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyFT3(u8 * baseAddr)\r
+void primPolyFT3(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4214,7 +4214,7 @@ void RectTexAlign(void)
 \r
 }\r
 \r
-void primPolyFT4(u8 * baseAddr)\r
+void primPolyFT4(unsigned char * baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4302,7 +4302,7 @@ void primPolyFT4(u8 * baseAddr)
 // cmd: smooth shaded Texture3\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyGT3(u8 *baseAddr)\r
+void primPolyGT3(unsigned char *baseAddr)\r
 {    \r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4411,7 +4411,7 @@ void primPolyGT3(u8 *baseAddr)
 // cmd: smooth shaded Poly3\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyG3(u8 *baseAddr)\r
+void primPolyG3(unsigned char *baseAddr)\r
 {    \r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4456,7 +4456,7 @@ void primPolyG3(u8 *baseAddr)
 // cmd: smooth shaded Texture4\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyGT4(u8 *baseAddr)\r
+void primPolyGT4(unsigned char *baseAddr)\r
 { \r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4576,7 +4576,7 @@ void primPolyGT4(u8 *baseAddr)
 // cmd: smooth shaded Poly3\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primPolyF3(u8 *baseAddr)\r
+void primPolyF3(unsigned char *baseAddr)\r
 {    \r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4620,7 +4620,7 @@ void primPolyF3(u8 *baseAddr)
 // cmd: skipping shaded polylines\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primLineGSkip(u8 *baseAddr)\r
+void primLineGSkip(unsigned char *baseAddr)\r
 {    \r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4645,7 +4645,7 @@ void primLineGSkip(u8 *baseAddr)
 // cmd: shaded polylines\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primLineGEx(u8 *baseAddr)\r
+void primLineGEx(unsigned char *baseAddr)\r
 {    \r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  int iMax=255;\r
@@ -4709,7 +4709,7 @@ void primLineGEx(u8 *baseAddr)
 // cmd: shaded polyline2\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primLineG2(u8 *baseAddr)\r
+void primLineG2(unsigned char *baseAddr)\r
 {    \r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4754,7 +4754,7 @@ void primLineG2(u8 *baseAddr)
 // cmd: skipping flat polylines\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primLineFSkip(u8 *baseAddr)\r
+void primLineFSkip(unsigned char *baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  int i=2,iMax=255;\r
@@ -4774,7 +4774,7 @@ void primLineFSkip(u8 *baseAddr)
 // cmd: drawing flat polylines\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primLineFEx(u8 *baseAddr)\r
+void primLineFEx(unsigned char *baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  int iMax;\r
@@ -4832,7 +4832,7 @@ void primLineFEx(u8 *baseAddr)
 // cmd: drawing flat polyline2\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primLineF2(u8 *baseAddr)\r
+void primLineF2(unsigned char *baseAddr)\r
 {\r
  unsigned long *gpuData = ((unsigned long *) baseAddr);\r
  short *sgpuData = ((short *) baseAddr);\r
@@ -4873,7 +4873,7 @@ void primLineF2(u8 *baseAddr)
 // cmd: well, easiest command... not implemented\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void primNI(u8 *bA)\r
+void primNI(unsigned char *bA)\r
 {\r
 }\r
 \r
@@ -4881,7 +4881,7 @@ void primNI(u8 *bA)
 // cmd func ptr table\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void (*primTableJ[256])(u8 *) = \r
+void (*primTableJ[256])(unsigned char *) = \r
 {\r
     // 00\r
     primNI,primNI,primBlkFill,primNI,primNI,primNI,primNI,primNI,\r
@@ -4953,7 +4953,7 @@ void (*primTableJ[256])(u8 *) =
 // cmd func ptr table for skipping\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void (*primTableSkip[256])(u8 *) = \r
+void (*primTableSkip[256])(unsigned char *) = \r
 {\r
     // 00\r
     primNI,primNI,primBlkFill,primNI,primNI,primNI,primNI,primNI,\r