notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
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
897c942
..
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
-u
8
*psxVSecure;
\r
-u
8
*psxVub;
\r
+u
nsigned char
*psxVSecure;
\r
+u
nsigned 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 u
8
gpuCommand = 0;
\r
+static u
nsigned 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
-u
8
* pGfxCardScreen=0;
\r
+u
nsigned 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
@@
-161,7
+161,7
@@
static void (*rearmed_get_layer_pos)(int *x, int *y, int *w, int *h);
////////////////////////////////////////////////////////////////////////
\r
\r
#ifdef _WINDOWS
\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
@@
-208,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
@@
-237,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
@@
-432,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=(u
8
*)malloc((iGPUHeight*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security
\r
+psxVSecure=(u
nsigned 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
@@
-560,9
+560,7
@@
long CALLBACK GPUopen(int hwndGPU)
#ifdef _WINDOWS
\r
iResX=240;iResY=320;
\r
#endif
\r
#ifdef _WINDOWS
\r
iResX=240;iResY=320;
\r
#endif
\r
-#ifdef MAEMO_CHANGES
\r
- iResX=800;iResY=480;
\r
-#endif
\r
+ iResX=800;iResY=480;
\r
iColDepth=8;
\r
bChangeRes=FALSE;
\r
#ifdef _WINDOWS
\r
iColDepth=8;
\r
bChangeRes=FALSE;
\r
#ifdef _WINDOWS
\r
@@
-1730,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
- u
8
* ps;
\r
- u
8
* px;
\r
+ u
nsigned char
* ps;
\r
+ u
nsigned 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
@@
-1828,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=(u
8
*)malloc(iResX*iResY*4);
\r
+ pGfxCardScreen=(u
nsigned char
*)malloc(iResX*iResY*4);
\r
}
\r
\r
ps=pGfxCardScreen;
\r
}
\r
\r
ps=pGfxCardScreen;
\r
@@
-1881,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
- u
8
* ps, * px;
\r
+ u
nsigned 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
@@
-1976,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=(u
8
*)malloc(iResX*iResY*4);
\r
+ pGfxCardScreen=(u
nsigned char
*)malloc(iResX*iResY*4);
\r
}
\r
\r
ps=pGfxCardScreen;
\r
}
\r
\r
ps=pGfxCardScreen;
\r
@@
-2112,7
+2110,7
@@
unsigned long CALLBACK GPUreadData(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 u
8
primTableCX[256] =
\r
+const u
nsigned 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
@@
-2192,7
+2190,7
@@
void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)
void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)
\r
#endif
\r
{
\r
void CALLBACK GPUwriteDataMem(unsigned long * pMem, int iSize)
\r
#endif
\r
{
\r
-u
8
command;
\r
+u
nsigned 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
@@
-2252,7
+2250,7
@@
ENDVRAM:
\r
if(iDataWriteMode==DR_NORMAL)
\r
{
\r
\r
if(iDataWriteMode==DR_NORMAL)
\r
{
\r
- void (* *primFunc)(u
8
*);
\r
+ void (* *primFunc)(u
nsigned char
*);
\r
if(bSkipNextFrame) primFunc=primTableSkip;
\r
else primFunc=primTableJ;
\r
\r
if(bSkipNextFrame) primFunc=primTableSkip;
\r
else primFunc=primTableJ;
\r
\r
@@
-2264,7
+2262,7
@@
if(iDataWriteMode==DR_NORMAL)
\r
if(gpuDataC == 0)
\r
{
\r
\r
if(gpuDataC == 0)
\r
{
\r
- command = (u
8
)((gdata>>24) & 0xff);
\r
+ command = (u
nsigned char
)((gdata>>24) & 0xff);
\r
\r
if(primTableCX[command])
\r
{
\r
\r
if(primTableCX[command])
\r
{
\r
@@
-2293,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]((u
8
*)gpuDataM);
\r
+ primFunc[gpuCommand]((u
nsigned 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
@@
-2357,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
@@
-2464,7
+2462,7
@@
long CALLBACK GPUdmaChain(unsigned long * baseAddrL, unsigned long addr)
#endif
\r
{
\r
unsigned long dmaMem;
\r
#endif
\r
{
\r
unsigned long dmaMem;
\r
-u
8
* baseAddrB;
\r
+u
nsigned 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
@@
-2473,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 = (u
8
*) baseAddrL;
\r
+baseAddrB = (u
nsigned char
*) baseAddrL;
\r
\r
do
\r
{
\r
\r
do
\r
{
\r
@@
-2604,7
+2602,7
@@
ResetTextureArea(TRUE);
//10 = red
\r
//11 = transparent
\r
\r
//10 = red
\r
//11 = transparent
\r
\r
-u
8
cFont[10][120]=
\r
+u
nsigned 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
@@
-2830,7
+2828,7
@@
u8 cFont[10][120]=
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-void PaintPicDot(u
8 * p,u8
c)
\r
+void PaintPicDot(u
nsigned 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
@@
-2840,19
+2838,19
@@
void PaintPicDot(u8 * p,u8 c)
////////////////////////////////////////////////////////////////////////
\r
\r
#ifdef _WINDOWS
\r
////////////////////////////////////////////////////////////////////////
\r
\r
#ifdef _WINDOWS
\r
-void CALLBACK GPUgetScreenPic(u
8
* pMem)
\r
+void CALLBACK GPUgetScreenPic(u
nsigned char
* pMem)
\r
#else
\r
#else
\r
-long CALLBACK GPUgetScreenPic(u
8
* pMem)
\r
+long CALLBACK GPUgetScreenPic(u
nsigned 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
- u
8
* ps, * px, * pf;
\r
- u
8
c;
\r
+ u
nsigned char
* ps, * px, * pf;
\r
+ u
nsigned 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=(u
8
*)malloc(iResX*iResY*4);
\r
+ pGfxCardScreen=(u
nsigned char
*)malloc(iResX*iResY*4);
\r
}
\r
\r
ps=pGfxCardScreen;
\r
}
\r
\r
ps=pGfxCardScreen;
\r
@@
-2891,13
+2889,13
@@
long CALLBACK GPUgetScreenPic(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,(u
8
)v);pf+=3; // paint the dots into the rect
\r
+ PaintPicDot(pf,(u
nsigned char
)v);pf+=3; // paint the dots into the rect
\r
v=(c&0x30)>>4;
\r
v=(c&0x30)>>4;
\r
- PaintPicDot(pf,(u
8
)v);pf+=3;
\r
+ PaintPicDot(pf,(u
nsigned char
)v);pf+=3;
\r
v=(c&0x0c)>>2;
\r
v=(c&0x0c)>>2;
\r
- PaintPicDot(pf,(u
8
)v);pf+=3;
\r
+ PaintPicDot(pf,(u
nsigned char
)v);pf+=3;
\r
v=c&0x03;
\r
v=c&0x03;
\r
- PaintPicDot(pf,(u
8
)v);pf+=3;
\r
+ PaintPicDot(pf,(u
nsigned char
)v);pf+=3;
\r
}
\r
pf+=104*3;
\r
}
\r
}
\r
pf+=104*3;
\r
}
\r
@@
-2923,9
+2921,9
@@
long CALLBACK GPUgetScreenPic(u8 * pMem)
////////////////////////////////////////////////////////////////////////
\r
\r
#ifdef _WINDOWS
\r
////////////////////////////////////////////////////////////////////////
\r
\r
#ifdef _WINDOWS
\r
-void CALLBACK GPUshowScreenPic(u
8
* pMem)
\r
+void CALLBACK GPUshowScreenPic(u
nsigned char
* pMem)
\r
#else
\r
#else
\r
-long CALLBACK GPUshowScreenPic(u
8
* pMem)
\r
+long CALLBACK GPUshowScreenPic(u
nsigned char
* pMem)
\r
#endif
\r
{
\r
// DestroyPic();
\r
#endif
\r
{
\r
// DestroyPic();
\r