gpu-gles: schtruck/fpse merge: gl error checks

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

diff --git a/plugins/gpu-gles/gpuPrim.c b/plugins/gpu-gles/gpuPrim.c
index 980d3dd..5d17f2d 100644 (file)
--- a/plugins/gpu-gles/gpuPrim.c
+++ b/plugins/gpu-gles/gpuPrim.c
@@ -26,13 +26,6 @@
 \r
 #define _IN_PRIMDRAW\r
 \r
-#ifdef _WINDOWS\r
-#include "stdafx.h"\r
-#include "externals.h"\r
-#include "gpu.h"\r
-#include "draw.h"\r
-#include "texture.h"\r
-#else\r
 #include "gpuStdafx.h"\r
 #include "gpuExternals.h"\r
 #include "gpuPlugin.h"\r
@@ -40,8 +33,6 @@
 #include "gpuTexture.h"\r
 #include "gpuPrim.h"\r
 \r
-#endif\r
-\r
 ////////////////////////////////////////////////////////////////////////                                          \r
 // defines\r
 ////////////////////////////////////////////////////////////////////////\r
@@ -53,10 +44,9 @@
 // globals\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-//#ifndef _WINDOWS\r
-//EGLSurface surface;\r
-//EGLDisplay display;\r
-//#endif\r
+EGLSurface surface;\r
+EGLDisplay display;\r
+\r
 \r
 BOOL           bDrawTextured;                          // current active drawing states\r
 BOOL           bDrawSmoothShaded;\r
@@ -146,66 +136,6 @@ void UpdateGlobalTP(unsigned short gdata)
 // Some ASM color convertion... Lewpy's special...\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-#ifdef _WINDOWS\r
-#pragma warning  (disable : 4035)\r
-\r
-unsigned long DoubleBGR2RGB (unsigned long BGR)\r
-{\r
-\r
-    __asm\r
-    {\r
-        mov eax, BGR                /* this can hold the G value */\r
-        mov ebx, eax                /* this can hold the R value */\r
-        mov edx, eax                /* this can hold the B value */\r
-        and ebx, 000000ffh          /* mask the R value */\r
-        shl ebx, 1\r
-        test ebx, 00000100h\r
-        jz    RSKIP\r
-        mov ebx, 000000ffh\r
-\r
-RSKIP: \r
-        and eax, 0000ff00h          /* mask the G value */\r
-        shl eax, 1\r
-        test eax, 00010000h\r
-        jz    GSKIP\r
-        mov eax, 0000ff00h\r
-\r
-GSKIP: \r
-        and edx, 00ff0000h          /* mask the B value */\r
-        shl edx, 1\r
-        test edx, 01000000h\r
-        jz    BSKIP\r
-        mov edx, 00ff0000h\r
-        \r
-BSKIP: \r
-        or  eax, ebx                /* add R to G value */\r
-        or  eax, edx                /* add B to RG value */\r
-    }\r
-    /* Result returned in EAX */\r
-}\r
-\r
-unsigned short BGR24to16 (unsigned long BGR)\r
-{\r
-    __asm\r
-    {\r
-        mov eax, BGR                /* this can hold the G value */\r
-        mov ebx, eax                /* this can hold the R value */\r
-        mov edx, eax                /* this can hold the B value */\r
-        shr ebx, 3                  /* move the R value */\r
-        and edx, 00f80000h          /* mask the B value */\r
-        shr edx, 9                  /* move the B value */\r
-        and eax, 00f800h            /* mask the G value */\r
-        shr eax, 6                  /* move the G value */\r
-        and ebx, 0000001fh          /* mask the R value */\r
-        or  eax, ebx                /* add R to G value */\r
-        or  eax, edx                /* add B to RG value */\r
-    }\r
-    /* Result returned in AX */\r
-}\r
-\r
-#pragma warning  (default : 4035)\r
-\r
-#else\r
 \r
 unsigned long DoubleBGR2RGB (unsigned long BGR)\r
 {\r
@@ -228,13 +158,12 @@ unsigned short BGR24to16 (unsigned long BGR)
  return ((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6);\r
 }\r
 \r
-#endif\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
 // OpenGL primitive drawing commands\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-__inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, \r
+void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,\r
                                    OGLVertex* vertex3, OGLVertex* vertex4) \r
 {\r
 \r
@@ -732,7 +661,7 @@ void SetSemiTrans(void)
  if(!DrawSemiTrans)                                    // no semi trans at all?\r
   {\r
    if(bBlendEnable)\r
-    {glDisable(GL_BLEND);bBlendEnable=FALSE;}          // -> don't wanna blend\r
+    {glDisable(GL_BLEND);glError();bBlendEnable=FALSE;}// -> don't wanna blend\r
    ubGloAlpha=ubGloColAlpha=255;                       // -> full alpha\r
    return;                                             // -> and bye\r
   }\r
@@ -740,7 +669,7 @@ void SetSemiTrans(void)
  ubGloAlpha=ubGloColAlpha=TransSets[GlobalTextABR].alpha;\r
 \r
  if(!bBlendEnable)\r
-  {glEnable(GL_BLEND);bBlendEnable=TRUE;}              // wanna blend\r
+  {glEnable(GL_BLEND);glError();bBlendEnable=TRUE;}    // wanna blend\r
 \r
  if(TransSets[GlobalTextABR].srcFac!=obm1 || \r
     TransSets[GlobalTextABR].dstFac!=obm2)\r
@@ -749,7 +678,7 @@ void SetSemiTrans(void)
     {\r
      obm1=TransSets[GlobalTextABR].srcFac;\r
      obm2=TransSets[GlobalTextABR].dstFac;\r
-     glBlendFunc(obm1,obm2);                           // set blend func\r
+     glBlendFunc(obm1,obm2); glError();                // set blend func\r
     }\r
    /*else\r
    if(TransSets[GlobalTextABR].dstFac !=GL_ONE_MINUS_SRC_COLOR)\r
@@ -780,7 +709,7 @@ void SetScanTrans(void)                                // blending for scan line
 */\r
  obm1=TransSets[0].srcFac;\r
  obm2=TransSets[0].dstFac;\r
- glBlendFunc(obm1,obm2);                               // set blend func\r
+ glBlendFunc(obm1,obm2); glError();                    // set blend func\r
 }\r
 \r
 void SetScanTexTrans(void)                             // blending for scan mask texture\r
@@ -793,7 +722,7 @@ void SetScanTexTrans(void)                             // blending for scan mask
 */\r
  obm1=TransSets[2].srcFac;\r
  obm2=TransSets[2].dstFac;\r
- glBlendFunc(obm1,obm2);                               // set blend func\r
+ glBlendFunc(obm1,obm2); glError();                    // set blend func\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////                                          \r
@@ -873,11 +802,11 @@ void SetSemiTransMulti(int Pass)
   }\r
 \r
  if(!bBlendEnable)\r
-  {glEnable(GL_BLEND);bBlendEnable=TRUE;}              // wanna blend\r
+  {glEnable(GL_BLEND);glError();bBlendEnable=TRUE;}    // wanna blend\r
 \r
  if(bm1!=obm1 || bm2!=obm2)\r
   {\r
-   glBlendFunc(bm1,bm2);                               // set blend func\r
+   glBlendFunc(bm1,bm2); glError();                    // set blend func\r
    obm1=bm1;obm2=bm2;\r
   }\r
 }\r
@@ -1018,14 +947,14 @@ void SetRenderMode(unsigned long DrawAttributes,BOOL bSCol)
    else                 currTex=SelectSubTextureS(GlobalTextTP,ulClutID);\r
 \r
    if(gTexName!=currTex)\r
-    {gTexName=currTex;glBindTexture(GL_TEXTURE_2D,currTex);}\r
+    {gTexName=currTex;glBindTexture(GL_TEXTURE_2D,currTex); glError();}\r
 \r
    if(!bTexEnabled)                                    // -> turn texturing on\r
-    {bTexEnabled=TRUE;glEnable(GL_TEXTURE_2D);}\r
+    {bTexEnabled=TRUE;glEnable(GL_TEXTURE_2D); glError();}\r
   }\r
  else                                                  // no texture ?\r
  if(bTexEnabled) \r
-  {bTexEnabled=FALSE;glDisable(GL_TEXTURE_2D);}        // -> turn texturing off\r
+  {bTexEnabled=FALSE;glDisable(GL_TEXTURE_2D); glError();} // -> turn texturing off\r
 \r
  if(bSCol)                                             // also set color ?\r
   {\r
@@ -1051,6 +980,7 @@ void SetRenderMode(unsigned long DrawAttributes,BOOL bSCol)
   {\r
    if(bDrawSmoothShaded) glShadeModel(GL_SMOOTH);      // -> set actual shading\r
    else                  glShadeModel(GL_FLAT);\r
+   glError();\r
    bOldSmoothShaded=bDrawSmoothShaded;\r
   }\r
 }\r
@@ -1514,7 +1444,7 @@ void PrepareFullScreenUpload (long Position)
 ////////////////////////////////////////////////////////////////////////\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-u8 * LoadDirectMovieFast(void);\r
+unsigned char * LoadDirectMovieFast(void);\r
 \r
 void UploadScreenEx(long Position)\r
 {\r
@@ -1523,14 +1453,14 @@ void UploadScreenEx(long Position)
  if(!PSXDisplay.DisplayMode.x) return;\r
  if(!PSXDisplay.DisplayMode.y) return;\r
 \r
- glDisable(GL_SCISSOR_TEST);\r
- glShadeModel(GL_FLAT);\r
+ glDisable(GL_SCISSOR_TEST); glError();\r
+ glShadeModel(GL_FLAT); glError();\r
  bOldSmoothShaded=FALSE;\r
- glDisable(GL_BLEND);\r
+ glDisable(GL_BLEND); glError();\r
  bBlendEnable=FALSE;\r
- glDisable(GL_TEXTURE_2D);\r
+ glDisable(GL_TEXTURE_2D); glError();\r
  bTexEnabled=FALSE;\r
- glDisable(GL_ALPHA_TEST);\r
+ glDisable(GL_ALPHA_TEST); glError();\r
 \r
  //glPixelZoom(((float)rRatioRect.right)/((float)PSXDisplay.DisplayMode.x),\r
  //            -1.0f*(((float)rRatioRect.bottom)/((float)PSXDisplay.DisplayMode.y)));\r
@@ -1594,8 +1524,8 @@ void UploadScreenEx(long Position)
 \r
 // glPixelZoom(1.0F,1.0F);\r
 \r
- glEnable(GL_ALPHA_TEST);\r
- glEnable(GL_SCISSOR_TEST);\r
+ glEnable(GL_ALPHA_TEST); glError();\r
+ glEnable(GL_SCISSOR_TEST); glError();\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -1745,7 +1675,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
@@ -1763,13 +1693,13 @@ void cmdSTP(u8 * baseAddr)
    bCheckMask=TRUE;\r
    if(iDepthFunc==0) return;\r
    iDepthFunc=0;\r
-   glDepthFunc(GL_LESS);\r
+   glDepthFunc(GL_LESS); glError();\r
   }\r
  else\r
   {\r
    bCheckMask=FALSE;\r
    if(iDepthFunc==1) return;\r
-   glDepthFunc(GL_ALWAYS);\r
+   glDepthFunc(GL_ALWAYS); glError();\r
    iDepthFunc=1;\r
   }\r
 }\r
@@ -1778,7 +1708,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 +1719,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 +1928,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 +1959,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 +1994,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 +2025,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 +2182,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 +2204,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
@@ -2316,9 +2246,9 @@ void primBlkFill(u8 * baseAddr)
      b=((GLclampf)BLUE(gpuData[0]))/255.0f;\r
      r=((GLclampf)RED(gpuData[0]))/255.0f;\r
      \r
-     glDisable(GL_SCISSOR_TEST);                       \r
-     glClearColor(r,g,b,1.0f);\r
-     glClear(uiBufferBits); \r
+     glDisable(GL_SCISSOR_TEST); glError();\r
+     glClearColor(r,g,b,1.0f); glError();\r
+     glClear(uiBufferBits); glError();\r
      gl_z=0.0f;\r
 \r
      if(gpuData[0]!=0x02000000 &&\r
@@ -2349,7 +2279,7 @@ void primBlkFill(u8 * baseAddr)
         }\r
       }\r
 \r
-     glEnable(GL_SCISSOR_TEST);                       \r
+     glEnable(GL_SCISSOR_TEST); glError();\r
     }\r
    else\r
     {\r
@@ -2359,9 +2289,9 @@ void primBlkFill(u8 * baseAddr)
      SetRenderMode((unsigned long)0x01000000, FALSE);\r
      vertex[0].c.lcol=gpuData[0]|0xff000000;\r
      SETCOL(vertex[0]); \r
-     glDisable(GL_SCISSOR_TEST);                       \r
+     glDisable(GL_SCISSOR_TEST); glError();\r
      PRIMdrawQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);\r
-     glEnable(GL_SCISSOR_TEST);                       \r
+     glEnable(GL_SCISSOR_TEST); glError();\r
     }\r
   }\r
 \r
@@ -2471,7 +2401,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 +2560,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 +2625,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 +2672,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 +2719,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 +2830,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 +2951,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 +3071,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 +3242,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 +3381,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 +3426,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 +3449,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 +3490,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 +3708,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 +4144,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 +4232,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 +4341,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 +4386,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 +4506,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 +4550,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 +4575,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 +4639,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 +4684,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 +4704,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 +4762,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 +4803,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 +4811,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 +4883,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