notaz.gp2x.de / pcsx_rearmed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gpu-gles: clean up headers and stuff
[pcsx_rearmed.git] / plugins / gpu-gles / gpuPlugin.c
diff --git a/plugins/gpu-gles/gpuPlugin.c b/plugins/gpu-gles/gpuPlugin.c
index 07f158c..368c5ce 100644 (file)
--- a/plugins/gpu-gles/gpuPlugin.c
+++ b/plugins/gpu-gles/gpuPlugin.c
@@ -83,8 +83,8 @@ int           iTileCheat=0;
 // memory image of the PSX vram\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 // memory image of the PSX vram\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-u8  *psxVSecure;\r
-u8  *psxVub;\r
+unsigned char  *psxVSecure;\r
+unsigned char  *psxVub;\r
 signed   char  *psxVsb;\r
 unsigned short *psxVuw;\r
 unsigned short *psxVuw_eom;\r
 signed   char  *psxVsb;\r
 unsigned short *psxVuw;\r
 unsigned short *psxVuw_eom;\r
@@ -112,10 +112,10 @@ unsigned long   ulStatusControl[256];
 \r
 static long     GPUdataRet;\r
 long            lGPUstatusRet;\r
 \r
 static long     GPUdataRet;\r
 long            lGPUstatusRet;\r
-s8            szDispBuf[64];\r
+char            szDispBuf[64];\r
 \r
 static unsigned long gpuDataM[256];\r
 \r
 static unsigned long gpuDataM[256];\r
-static u8 gpuCommand = 0;\r
+static unsigned char gpuCommand = 0;\r
 static long          gpuDataC = 0;\r
 static long          gpuDataP = 0;\r
 \r
 static long          gpuDataC = 0;\r
 static long          gpuDataP = 0;\r
 \r
@@ -144,7 +144,7 @@ BOOL            bDisplayNotSet = TRUE;
 GLuint          uiScanLine=0;\r
 int             iUseScanLines=0;\r
 long            lSelectedSlot=0;\r
 GLuint          uiScanLine=0;\r
 int             iUseScanLines=0;\r
 long            lSelectedSlot=0;\r
-u8 * pGfxCardScreen=0;\r
+unsigned char * pGfxCardScreen=0;\r
 int             iBlurBuffer=0;\r
 int             iScanBlend=0;\r
 int             iRenderFVR=0;\r
 int             iBlurBuffer=0;\r
 int             iScanBlend=0;\r
 int             iRenderFVR=0;\r
@@ -154,12 +154,14 @@ int             iFakePrimBusy = 0;
 int             iRumbleVal    = 0;\r
 int             iRumbleTime   = 0;\r
 \r
 int             iRumbleVal    = 0;\r
 int             iRumbleTime   = 0;\r
 \r
+static void (*rearmed_get_layer_pos)(int *x, int *y, int *w, int *h);\r
+\r
 ////////////////////////////////////////////////////////////////////////\r
 // stuff to make this a true PDK module\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 #ifdef _WINDOWS\r
 ////////////////////////////////////////////////////////////////////////\r
 // stuff to make this a true PDK module\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 #ifdef _WINDOWS\r
-s8 * CALLBACK PSEgetLibName(void)\r
+char * CALLBACK PSEgetLibName(void)\r
 {\r
  return "name";\r
 }\r
 {\r
  return "name";\r
 }\r
@@ -206,14 +208,14 @@ void ResizeWindow()
  SetAspectRatio();\r
 }\r
 \r
  SetAspectRatio();\r
 }\r
 \r
-s8 * GetConfigInfos(int hW)\r
+char * GetConfigInfos(int hW)\r
 {\r
 #ifdef _WINDOWS\r
  HDC hdc;HGLRC hglrc;\r
 #endif\r
 {\r
 #ifdef _WINDOWS\r
  HDC hdc;HGLRC hglrc;\r
 #endif\r
- s8 szO[2][4]={"off","on "};\r
- s8 szTxt[256];\r
- s8 * pB=(s8 *)malloc(32767);\r
+ char szO[2][4]={"off","on "};\r
+ char szTxt[256];\r
+ char * pB=(char *)malloc(32767);\r
 /*\r
  if(!pB) return NULL;\r
  *pB=0;\r
 /*\r
  if(!pB) return NULL;\r
  *pB=0;\r
@@ -235,7 +237,7 @@ s8 * GetConfigInfos(int hW)
  strcat(pB,szTxt);\r
  sprintf(szTxt,"OGL version: %s\r\n\r\n",(char *)glGetString(GL_VERSION));\r
  strcat(pB,szTxt);\r
  strcat(pB,szTxt);\r
  sprintf(szTxt,"OGL version: %s\r\n\r\n",(char *)glGetString(GL_VERSION));\r
  strcat(pB,szTxt);\r
- //strcat(pB,(s8 *)glGetString(GL_EXTENSIONS));\r
+ //strcat(pB,(char *)glGetString(GL_EXTENSIONS));\r
  //strcat(pB,"\r\n\r\n");\r
 \r
 #ifdef _WINDOWS\r
  //strcat(pB,"\r\n\r\n");\r
 \r
 #ifdef _WINDOWS\r
@@ -396,7 +398,7 @@ void DoSnapShot(void)
 #ifdef _WINDOWS\r
 void CALLBACK GPUmakeSnapshot(void)\r
 #else\r
 #ifdef _WINDOWS\r
 void CALLBACK GPUmakeSnapshot(void)\r
 #else\r
-void CALLBACK GPU_makeSnapshot(void)\r
+void CALLBACK GPUmakeSnapshot(void)\r
 #endif\r
 {\r
  //bSnapShot = TRUE;\r
 #endif\r
 {\r
  //bSnapShot = TRUE;\r
@@ -409,7 +411,7 @@ void CALLBACK GPU_makeSnapshot(void)
 #ifdef _WINDOWS\r
 long CALLBACK GPUinit()\r
 #else\r
 #ifdef _WINDOWS\r
 long CALLBACK GPUinit()\r
 #else\r
-long CALLBACK GPU_init()\r
+long CALLBACK GPUinit()\r
 #endif\r
 {\r
 memset(ulStatusControl,0,256*sizeof(unsigned long));\r
 #endif\r
 {\r
 memset(ulStatusControl,0,256*sizeof(unsigned long));\r
@@ -430,7 +432,7 @@ iWinSize=MAKELONG(iResX,iResY);
 bKeepRatio = TRUE;\r
 // different ways of accessing PSX VRAM\r
 \r
 bKeepRatio = TRUE;\r
 // different ways of accessing PSX VRAM\r
 \r
-psxVSecure=(u8 *)malloc((iGPUHeight*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security\r
+psxVSecure=(unsigned char *)malloc((iGPUHeight*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security\r
 if(!psxVSecure) return -1;\r
 \r
 psxVub=psxVSecure+512*1024;                           // security offset into double sized psx vram!\r
 if(!psxVSecure) return -1;\r
 \r
 psxVub=psxVSecure+512*1024;                           // security offset into double sized psx vram!\r
@@ -543,7 +545,7 @@ HMENU hPSEMenu=NULL;
 \r
 long CALLBACK GPUopen(HWND hwndGPU)                    \r
 #else\r
 \r
 long CALLBACK GPUopen(HWND hwndGPU)                    \r
 #else\r
-long CALLBACK GPU_open(int hwndGPU)                    \r
+long CALLBACK GPUopen(int hwndGPU)\r
 #endif\r
 {\r
        #ifdef _WINDOWS\r
 #endif\r
 {\r
        #ifdef _WINDOWS\r
@@ -555,12 +557,11 @@ long CALLBACK GPU_open(int hwndGPU)
 \r
 \r
 \r
 \r
 \r
 \r
-                \r
-                \r
        #ifdef _WINDOWS\r
         iResX=240;iResY=320;\r
        #endif\r
        #ifdef _WINDOWS\r
         iResX=240;iResY=320;\r
        #endif\r
-        iColDepth=32;\r
+        iResX=800;iResY=480;\r
+        iColDepth=8;\r
         bChangeRes=FALSE;\r
        #ifdef _WINDOWS\r
         bWindowMode=TRUE;\r
         bChangeRes=FALSE;\r
        #ifdef _WINDOWS\r
         bWindowMode=TRUE;\r
@@ -705,7 +706,7 @@ long CALLBACK GPUclose()                               // WINDOWS CLOSE
 \r
 #else\r
 \r
 \r
 #else\r
 \r
-long GPU_close()                                        // LINUX CLOSE\r
+long GPUclose()                                        // LINUX CLOSE\r
 {\r
  GLcleanup();                                          // close OGL\r
 \r
 {\r
  GLcleanup();                                          // close OGL\r
 \r
@@ -725,7 +726,7 @@ long GPU_close()                                        // LINUX CLOSE
 #ifdef _WINDOWS\r
 long CALLBACK GPUshutdown()\r
 #else\r
 #ifdef _WINDOWS\r
 long CALLBACK GPUshutdown()\r
 #else\r
-long CALLBACK GPU_shutdown()\r
+long CALLBACK GPUshutdown()\r
 #endif\r
 {\r
  if(psxVSecure) free(psxVSecure);                      // kill emulated vram memory\r
 #endif\r
 {\r
  if(psxVSecure) free(psxVSecure);                      // kill emulated vram memory\r
@@ -783,7 +784,7 @@ void SetScanLines(void)
 \r
 int iLastRGB24=0;                                      // special vars for checking when to skip two display updates\r
 int iSkipTwo=0;\r
 \r
 int iLastRGB24=0;                                      // special vars for checking when to skip two display updates\r
 int iSkipTwo=0;\r
-void GPU_vSinc(void){\r
+void GPUvSinc(void){\r
 updateDisplay();\r
 }\r
 void updateDisplay(void)                               // UPDATE DISPLAY\r
 updateDisplay();\r
 }\r
 void updateDisplay(void)                               // UPDATE DISPLAY\r
@@ -1118,6 +1119,7 @@ float xs,ys,s;RECT r;
 if(!PSXDisplay.DisplayModeNew.x) return;\r
 if(!PSXDisplay.DisplayModeNew.y) return;\r
 \r
 if(!PSXDisplay.DisplayModeNew.x) return;\r
 if(!PSXDisplay.DisplayModeNew.y) return;\r
 \r
+#if 0\r
 xs=(float)iResX/(float)PSXDisplay.DisplayModeNew.x;\r
 ys=(float)iResY/(float)PSXDisplay.DisplayModeNew.y;\r
 \r
 xs=(float)iResX/(float)PSXDisplay.DisplayModeNew.x;\r
 ys=(float)iResY/(float)PSXDisplay.DisplayModeNew.y;\r
 \r
@@ -1169,7 +1171,11 @@ if(r.bottom<rRatioRect.bottom ||
  }\r
 \r
 rRatioRect=r;\r
  }\r
 \r
 rRatioRect=r;\r
-\r
+#else\r
+ // pcsx-rearmed hack\r
+ if (rearmed_get_layer_pos != NULL)\r
+   rearmed_get_layer_pos(&rRatioRect.left, &rRatioRect.top, &rRatioRect.right, &rRatioRect.bottom);\r
+#endif\r
 \r
 glViewport(rRatioRect.left,\r
            iResY-(rRatioRect.top+rRatioRect.bottom),\r
 \r
 glViewport(rRatioRect.left,\r
            iResY-(rRatioRect.top+rRatioRect.bottom),\r
@@ -1314,7 +1320,7 @@ static unsigned short usFirstPos=2;
 #ifdef _WINDOWS\r
 void CALLBACK GPUupdateLace(void)\r
 #else\r
 #ifdef _WINDOWS\r
 void CALLBACK GPUupdateLace(void)\r
 #else\r
-void CALLBACK GPU_updateLace(void)\r
+void CALLBACK GPUupdateLace(void)\r
 #endif\r
 {\r
 if(!(dwActFixes&0x1000))                               \r
 #endif\r
 {\r
 if(!(dwActFixes&0x1000))                               \r
@@ -1356,7 +1362,7 @@ if(bChangeWinMode) ChangeWindowMode();
 #ifdef _WINDOWS\r
 unsigned long CALLBACK GPUreadStatus(void)\r
 #else\r
 #ifdef _WINDOWS\r
 unsigned long CALLBACK GPUreadStatus(void)\r
 #else\r
-unsigned long CALLBACK GPU_readStatus(void)\r
+unsigned long CALLBACK GPUreadStatus(void)\r
 #endif\r
 {\r
 if(dwActFixes&0x1000)                                 // CC game fix\r
 #endif\r
 {\r
 if(dwActFixes&0x1000)                                 // CC game fix\r
@@ -1396,7 +1402,7 @@ return STATUSREG;
 #ifdef _WINDOWS\r
 void CALLBACK GPUwriteStatus(unsigned long gdata)\r
 #else\r
 #ifdef _WINDOWS\r
 void CALLBACK GPUwriteStatus(unsigned long gdata)\r
 #else\r
-void CALLBACK GPU_writeStatus(unsigned long gdata)\r
+void CALLBACK GPUwriteStatus(unsigned long gdata)\r
 #endif\r
 {\r
 unsigned long lCommand=(gdata>>24)&0xff;\r
 #endif\r
 {\r
 unsigned long lCommand=(gdata>>24)&0xff;\r
@@ -1722,8 +1728,8 @@ void CheckVRamReadEx(int x, int y, int dx, int dy)
  int ux,uy,udx,udy,wx,wy;\r
  unsigned short * p1, *p2;\r
  float XS,YS;\r
  int ux,uy,udx,udy,wx,wy;\r
  unsigned short * p1, *p2;\r
  float XS,YS;\r
- u8 * ps;\r
- u8 * px;\r
+ unsigned char * ps;\r
+ unsigned char * px;\r
  unsigned short s,sx;\r
 \r
  if(STATUSREG&GPUSTATUS_RGB24) return;\r
  unsigned short s,sx;\r
 \r
  if(STATUSREG&GPUSTATUS_RGB24) return;\r
@@ -1820,7 +1826,7 @@ void CheckVRamReadEx(int x, int y, int dx, int dy)
  if(!pGfxCardScreen)\r
   {\r
    glPixelStorei(GL_PACK_ALIGNMENT,1);\r
  if(!pGfxCardScreen)\r
   {\r
    glPixelStorei(GL_PACK_ALIGNMENT,1);\r
-   pGfxCardScreen=(u8 *)malloc(iResX*iResY*4);\r
+   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);\r
   }\r
 \r
  ps=pGfxCardScreen;\r
   }\r
 \r
  ps=pGfxCardScreen;\r
@@ -1873,7 +1879,7 @@ void CheckVRamRead(int x, int y, int dx, int dy, bool bFront)
 {\r
  unsigned short sArea;unsigned short * p;\r
  int ux,uy,udx,udy,wx,wy;float XS,YS;\r
 {\r
  unsigned short sArea;unsigned short * p;\r
  int ux,uy,udx,udy,wx,wy;float XS,YS;\r
- u8 * ps, * px;\r
+ unsigned char * ps, * px;\r
  unsigned short s=0,sx;\r
 \r
  if(STATUSREG&GPUSTATUS_RGB24) return;\r
  unsigned short s=0,sx;\r
 \r
  if(STATUSREG&GPUSTATUS_RGB24) return;\r
@@ -1968,7 +1974,7 @@ void CheckVRamRead(int x, int y, int dx, int dy, bool bFront)
  if(!pGfxCardScreen)\r
   {\r
    glPixelStorei(GL_PACK_ALIGNMENT,1);\r
  if(!pGfxCardScreen)\r
   {\r
    glPixelStorei(GL_PACK_ALIGNMENT,1);\r
-   pGfxCardScreen=(u8 *)malloc(iResX*iResY*4);\r
+   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);\r
   }\r
 \r
  ps=pGfxCardScreen;\r
   }\r
 \r
  ps=pGfxCardScreen;\r
@@ -2012,7 +2018,7 @@ void CheckVRamRead(int x, int y, int dx, int dy, bool bFront)
 #ifdef _WINDOWS\r
 void CALLBACK GPUreadDataMem(unsigned int * pMem, int iSize)\r
 #else\r
 #ifdef _WINDOWS\r
 void CALLBACK GPUreadDataMem(unsigned int * pMem, int iSize)\r
 #else\r
-void CALLBACK GPU_readDataMem(unsigned long * pMem, int iSize)\r
+void CALLBACK GPUreadDataMem(unsigned long * pMem, int iSize)\r
 #endif\r
 {\r
 int i;\r
 #endif\r
 {\r
 int i;\r
@@ -2088,14 +2094,14 @@ GPUIsIdle;
 #ifdef _WINDOWS\r
 unsigned long CALLBACK GPUreadData(void)\r
 #else\r
 #ifdef _WINDOWS\r
 unsigned long CALLBACK GPUreadData(void)\r
 #else\r
-unsigned long CALLBACK GPU_readData(void)\r
+unsigned long CALLBACK GPUreadData(void)\r
 #endif\r
 {\r
  unsigned long l;\r
 #ifdef _WINDOWS\r
  GPUreadDataMem(&l,1);\r
 #else\r
 #endif\r
 {\r
  unsigned long l;\r
 #ifdef _WINDOWS\r
  GPUreadDataMem(&l,1);\r
 #else\r
- GPU_readDataMem(&l,1);\r
+ GPUreadDataMem(&l,1);\r
 #endif \r
  return GPUdataRet;\r
 }\r
 #endif \r
  return GPUdataRet;\r
 }\r
@@ -2104,7 +2110,7 @@ unsigned long CALLBACK GPU_readData(void)
 // helper table to know how much data is used by drawing commands\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 // helper table to know how much data is used by drawing commands\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-const u8 primTableCX[256] =\r
+const unsigned char primTableCX[256] =\r
 {\r
     // 00\r
     0,0,3,0,0,0,0,0,\r
 {\r
     // 00\r
     0,0,3,0,0,0,0,0,\r
@@ -2181,10 +2187,10 @@ const u8 primTableCX[256] =
 #ifdef _WINDOWS\r
 void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)\r
 #else\r
 #ifdef _WINDOWS\r
 void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)\r
 #else\r
-void CALLBACK GPU_writeDataMem(unsigned long * pMem, int iSize)\r
+void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)\r
 #endif\r
 {\r
 #endif\r
 {\r
-u8 command;\r
+unsigned char command;\r
 unsigned long gdata=0;\r
 int i=0;\r
 GPUIsBusy;\r
 unsigned long gdata=0;\r
 int i=0;\r
 GPUIsBusy;\r
@@ -2244,7 +2250,7 @@ ENDVRAM:
 \r
 if(iDataWriteMode==DR_NORMAL)\r
  {\r
 \r
 if(iDataWriteMode==DR_NORMAL)\r
  {\r
-  void (* *primFunc)(u8 *);\r
+  void (* *primFunc)(unsigned char *);\r
   if(bSkipNextFrame) primFunc=primTableSkip;\r
   else               primFunc=primTableJ;\r
 \r
   if(bSkipNextFrame) primFunc=primTableSkip;\r
   else               primFunc=primTableJ;\r
 \r
@@ -2256,7 +2262,7 @@ if(iDataWriteMode==DR_NORMAL)
 \r
     if(gpuDataC == 0)\r
      {\r
 \r
     if(gpuDataC == 0)\r
      {\r
-      command = (u8)((gdata>>24) & 0xff);\r
+      command = (unsigned char)((gdata>>24) & 0xff);\r
 \r
       if(primTableCX[command])\r
        {\r
 \r
       if(primTableCX[command])\r
        {\r
@@ -2285,7 +2291,7 @@ if(iDataWriteMode==DR_NORMAL)
     if(gpuDataP == gpuDataC)\r
      {\r
       gpuDataC=gpuDataP=0;\r
     if(gpuDataP == gpuDataC)\r
      {\r
       gpuDataC=gpuDataP=0;\r
-      primFunc[gpuCommand]((u8 *)gpuDataM);\r
+      primFunc[gpuCommand]((unsigned char *)gpuDataM);\r
 \r
       if(dwEmuFixes&0x0001 || dwActFixes&0x20000)     // hack for emulating "gpu busy" in some games\r
        iFakePrimBusy=4;\r
 \r
       if(dwEmuFixes&0x0001 || dwActFixes&0x20000)     // hack for emulating "gpu busy" in some games\r
        iFakePrimBusy=4;\r
@@ -2304,13 +2310,13 @@ GPUIsIdle;
 #ifdef _WINDOWS\r
 void CALLBACK GPUwriteData(unsigned long gdata)\r
 #else\r
 #ifdef _WINDOWS\r
 void CALLBACK GPUwriteData(unsigned long gdata)\r
 #else\r
-void CALLBACK GPU_writeData(unsigned long gdata)\r
+void CALLBACK GPUwriteData(unsigned long gdata)\r
 #endif\r
 {\r
 #ifdef _WINDOWS\r
  GPUwriteDataMem(&gdata,1);\r
 #else\r
 #endif\r
 {\r
 #ifdef _WINDOWS\r
  GPUwriteDataMem(&gdata,1);\r
 #else\r
- GPU_writeDataMem(&gdata,1);\r
+ GPUwriteDataMem(&gdata,1);\r
 #endif \r
 }\r
 \r
 #endif \r
 }\r
 \r
@@ -2349,9 +2355,9 @@ return iT;
 \r
 /*#include <unistd.h>\r
 \r
 \r
 /*#include <unistd.h>\r
 \r
-void StartCfgTool(s8 * pCmdLine)                     // linux: start external cfg tool\r
+void StartCfgTool(char * pCmdLine)                     // linux: start external cfg tool\r
 {\r
 {\r
- FILE * cf;s8 filename[255],t[255];\r
+ FILE * cf;char filename[255],t[255];\r
 \r
  strcpy(filename,"cfg/cfgPeopsMesaGL");                 // look in cfg sub folder first\r
  cf=fopen(filename,"rb");\r
 \r
  strcpy(filename,"cfg/cfgPeopsMesaGL");                 // look in cfg sub folder first\r
  cf=fopen(filename,"rb");\r
@@ -2398,7 +2404,7 @@ void StartCfgTool(s8 * pCmdLine)                     // linux: start external cf
 #ifdef _WINDOWS\r
 long CALLBACK GPUconfigure(void)\r
 #else\r
 #ifdef _WINDOWS\r
 long CALLBACK GPUconfigure(void)\r
 #else\r
-long CALLBACK GPU_configure(void)\r
+long CALLBACK GPUconfigure(void)\r
 #endif\r
 {\r
 \r
 #endif\r
 {\r
 \r
@@ -2452,11 +2458,11 @@ return FALSE;
 #ifdef _WINDOWS\r
 long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr)\r
 #else\r
 #ifdef _WINDOWS\r
 long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr)\r
 #else\r
-long CALLBACK GPU_dmaChain(unsigned long * baseAddrL, unsigned long addr)\r
+long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr)\r
 #endif\r
 {\r
 unsigned long dmaMem;\r
 #endif\r
 {\r
 unsigned long dmaMem;\r
-u8 * baseAddrB;\r
+unsigned char * baseAddrB;\r
 short count;unsigned int DMACommandCounter = 0;\r
 \r
 if(bIsFirstFrame) GLinitialize();\r
 short count;unsigned int DMACommandCounter = 0;\r
 \r
 if(bIsFirstFrame) GLinitialize();\r
@@ -2465,7 +2471,7 @@ GPUIsBusy;
 \r
 lUsedAddr[0]=lUsedAddr[1]=lUsedAddr[2]=0xffffff;\r
 \r
 \r
 lUsedAddr[0]=lUsedAddr[1]=lUsedAddr[2]=0xffffff;\r
 \r
-baseAddrB = (u8*) baseAddrL;\r
+baseAddrB = (unsigned char*) baseAddrL;\r
 \r
 do\r
  {\r
 \r
 do\r
  {\r
@@ -2481,7 +2487,7 @@ do
 #ifdef _WINDOWS\r
   if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);\r
 #else\r
 #ifdef _WINDOWS\r
   if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);\r
 #else\r
-  if(count>0) GPU_writeDataMem(&baseAddrL[dmaMem>>2],count);\r
+  if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);\r
 #endif\r
   \r
   addr = baseAddrL[addr>>2]&0xffffff;\r
 #endif\r
   \r
   addr = baseAddrL[addr>>2]&0xffffff;\r
@@ -2500,7 +2506,7 @@ return 0;
 #ifdef _WINDOWS\r
 void CALLBACK GPUabout(void)\r
 #else\r
 #ifdef _WINDOWS\r
 void CALLBACK GPUabout(void)\r
 #else\r
-void CALLBACK GPU_about(void)\r
+void CALLBACK GPUabout(void)\r
 #endif\r
 {\r
 \r
 #endif\r
 {\r
 \r
@@ -2513,7 +2519,7 @@ void CALLBACK GPU_about(void)
 #ifdef _WINDOWS\r
 long CALLBACK GPUtest(void)\r
 #else\r
 #ifdef _WINDOWS\r
 long CALLBACK GPUtest(void)\r
 #else\r
-long CALLBACK GPU_test(void)\r
+long CALLBACK GPUtest(void)\r
 #endif\r
 {\r
  // if test fails this function should return negative value for error (unable to continue)\r
 #endif\r
 {\r
  // if test fails this function should return negative value for error (unable to continue)\r
@@ -2531,7 +2537,7 @@ long CALLBACK GPU_test(void)
 #ifdef _WINDOWS\r
 long CALLBACK GPUfreeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF)\r
 #else\r
 #ifdef _WINDOWS\r
 long CALLBACK GPUfreeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF)\r
 #else\r
-long CALLBACK GPU_freeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF)\r
+long CALLBACK GPUfreeze(unsigned long ulGetFreezeData,GPUFreeze_t * pF)\r
 #endif\r
 {\r
 if(ulGetFreezeData==2) \r
 #endif\r
 {\r
 if(ulGetFreezeData==2) \r
@@ -2574,15 +2580,15 @@ ResetTextureArea(TRUE);
  GPUwriteStatus(ulStatusControl[5]);\r
  GPUwriteStatus(ulStatusControl[4]);\r
 #else\r
  GPUwriteStatus(ulStatusControl[5]);\r
  GPUwriteStatus(ulStatusControl[4]);\r
 #else\r
- GPU_writeStatus(ulStatusControl[0]);\r
- GPU_writeStatus(ulStatusControl[1]);\r
- GPU_writeStatus(ulStatusControl[2]);\r
- GPU_writeStatus(ulStatusControl[3]);\r
- GPU_writeStatus(ulStatusControl[8]);\r
- GPU_writeStatus(ulStatusControl[6]);\r
- GPU_writeStatus(ulStatusControl[7]);\r
- GPU_writeStatus(ulStatusControl[5]);\r
- GPU_writeStatus(ulStatusControl[4]);\r
+ GPUwriteStatus(ulStatusControl[0]);\r
+ GPUwriteStatus(ulStatusControl[1]);\r
+ GPUwriteStatus(ulStatusControl[2]);\r
+ GPUwriteStatus(ulStatusControl[3]);\r
+ GPUwriteStatus(ulStatusControl[8]);\r
+ GPUwriteStatus(ulStatusControl[6]);\r
+ GPUwriteStatus(ulStatusControl[7]);\r
+ GPUwriteStatus(ulStatusControl[5]);\r
+ GPUwriteStatus(ulStatusControl[4]);\r
 #endif\r
  return 1;\r
 }\r
 #endif\r
  return 1;\r
 }\r
@@ -2596,7 +2602,7 @@ ResetTextureArea(TRUE);
 //10 = red\r
 //11 = transparent\r
 \r
 //10 = red\r
 //11 = transparent\r
 \r
-u8 cFont[10][120]=\r
+unsigned char cFont[10][120]=\r
 {\r
 // 0\r
 {0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,\r
 {\r
 // 0\r
 {0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,\r
@@ -2822,7 +2828,7 @@ u8 cFont[10][120]=
 \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 \r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-void PaintPicDot(u8 * p,u8 c)\r
+void PaintPicDot(unsigned char * p,unsigned char c)\r
 {\r
  if(c==0) {*p++=0x00;*p++=0x00;*p=0x00;return;}\r
  if(c==1) {*p++=0xff;*p++=0xff;*p=0xff;return;}\r
 {\r
  if(c==0) {*p++=0x00;*p++=0x00;*p=0x00;return;}\r
  if(c==1) {*p++=0xff;*p++=0xff;*p=0xff;return;}\r
@@ -2832,19 +2838,19 @@ void PaintPicDot(u8 * p,u8 c)
 ////////////////////////////////////////////////////////////////////////\r
 \r
 #ifdef _WINDOWS\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 #ifdef _WINDOWS\r
-void CALLBACK GPUgetScreenPic(u8 * pMem)\r
+void CALLBACK GPUgetScreenPic(unsigned char * pMem)\r
 #else\r
 #else\r
-long CALLBACK GPU_getScreenPic(u8 * pMem)\r
+long CALLBACK GPUgetScreenPic(unsigned char * pMem)\r
 #endif\r
 {\r
  float XS,YS;int x,y,v;\r
 #endif\r
 {\r
  float XS,YS;int x,y,v;\r
- u8 * ps, * px, * pf;\r
- u8 c;\r
+ unsigned char * ps, * px, * pf;\r
+ unsigned char c;\r
 \r
  if(!pGfxCardScreen)\r
   {\r
    glPixelStorei(GL_PACK_ALIGNMENT,1);\r
 \r
  if(!pGfxCardScreen)\r
   {\r
    glPixelStorei(GL_PACK_ALIGNMENT,1);\r
-   pGfxCardScreen=(u8 *)malloc(iResX*iResY*4);\r
+   pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);\r
   }\r
 \r
  ps=pGfxCardScreen;\r
   }\r
 \r
  ps=pGfxCardScreen;\r
@@ -2883,13 +2889,13 @@ long CALLBACK GPU_getScreenPic(u8 * pMem)
     {\r
      c=cFont[lSelectedSlot][x+y*6];\r
      v=(c&0xc0)>>6;\r
     {\r
      c=cFont[lSelectedSlot][x+y*6];\r
      v=(c&0xc0)>>6;\r
-     PaintPicDot(pf,(u8)v);pf+=3;                // paint the dots into the rect\r
+     PaintPicDot(pf,(unsigned char)v);pf+=3;                // paint the dots into the rect\r
      v=(c&0x30)>>4;\r
      v=(c&0x30)>>4;\r
-     PaintPicDot(pf,(u8)v);pf+=3;\r
+     PaintPicDot(pf,(unsigned char)v);pf+=3;\r
      v=(c&0x0c)>>2;\r
      v=(c&0x0c)>>2;\r
-     PaintPicDot(pf,(u8)v);pf+=3;\r
+     PaintPicDot(pf,(unsigned char)v);pf+=3;\r
      v=c&0x03;\r
      v=c&0x03;\r
-     PaintPicDot(pf,(u8)v);pf+=3;\r
+     PaintPicDot(pf,(unsigned char)v);pf+=3;\r
     }\r
    pf+=104*3;\r
   }\r
     }\r
    pf+=104*3;\r
   }\r
@@ -2915,9 +2921,9 @@ long CALLBACK GPU_getScreenPic(u8 * pMem)
 ////////////////////////////////////////////////////////////////////////\r
 \r
 #ifdef _WINDOWS\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
 #ifdef _WINDOWS\r
-void CALLBACK GPUshowScreenPic(u8 * pMem)\r
+void CALLBACK GPUshowScreenPic(unsigned char * pMem)\r
 #else\r
 #else\r
-long CALLBACK GPU_showScreenPic(u8 * pMem)\r
+long CALLBACK GPUshowScreenPic(unsigned char * pMem)\r
 #endif\r
 {\r
 // DestroyPic();\r
 #endif\r
 {\r
 // DestroyPic();\r
@@ -2958,3 +2964,10 @@ void CALLBACK GPUdisplayFlags(unsigned long dwFlags)
 {\r
 // dwCoreFlags=dwFlags;\r
 }\r
 {\r
 // dwCoreFlags=dwFlags;\r
 }\r
+\r
+// pcsx-rearmed callbacks\r
+void CALLBACK GPUrearmedCallbacks(const void **cbs)\r
+{\r
+ rearmed_get_layer_pos = cbs[0];\r
+}\r
+\r
ARM optimized PCSX fork