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
gpulib: trust game's centering based on a database
[pcsx_rearmed.git]
/
plugins
/
gpu-gles
/
gpuPrim.c
diff --git
a/plugins/gpu-gles/gpuPrim.c
b/plugins/gpu-gles/gpuPrim.c
index
2f200eb
..
ed16e4a
100644
(file)
--- a/
plugins/gpu-gles/gpuPrim.c
+++ b/
plugins/gpu-gles/gpuPrim.c
@@
-44,9
+44,6
@@
// globals
\r
////////////////////////////////////////////////////////////////////////
\r
\r
// globals
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-EGLSurface surface;
\r
-EGLDisplay display;
\r
-
\r
\r
BOOL bDrawTextured; // current active drawing states
\r
BOOL bDrawSmoothShaded;
\r
\r
BOOL bDrawTextured; // current active drawing states
\r
BOOL bDrawSmoothShaded;
\r
@@
-80,15
+77,15
@@
BOOL bUsingMovie=FALSE; // movie active flag
PSXRect_t xrMovieArea; // rect for movie upload
\r
short sSprite_ux2; // needed for sprire adjust
\r
short sSprite_vy2; //
\r
PSXRect_t xrMovieArea; // rect for movie upload
\r
short sSprite_ux2; // needed for sprire adjust
\r
short sSprite_vy2; //
\r
-unsigned
long
ulOLDCOL=0; // active color
\r
-unsigned
long
ulClutID; // clut
\r
+unsigned
int
ulOLDCOL=0; // active color
\r
+unsigned
int
ulClutID; // clut
\r
\r
\r
-unsigned
long
dwCfgFixes; // game fixes
\r
-unsigned
long
dwActFixes=0;
\r
-unsigned
long
dwEmuFixes=0;
\r
+unsigned
int
dwCfgFixes; // game fixes
\r
+unsigned
int
dwActFixes=0;
\r
+unsigned
int
dwEmuFixes=0;
\r
BOOL bUseFixes;
\r
\r
BOOL bUseFixes;
\r
\r
-
long
drawX,drawY,drawW,drawH; // offscreen drawing checkers
\r
+
int
drawX,drawY,drawW,drawH; // offscreen drawing checkers
\r
short sxmin,sxmax,symin,symax;
\r
unsigned int CSVERTEX=0,CSCOLOR=0,CSTEXTURE=0;
\r
\r
short sxmin,sxmax,symin,symax;
\r
unsigned int CSVERTEX=0,CSCOLOR=0,CSTEXTURE=0;
\r
\r
@@
-150,9
+147,9
@@
void UpdateGlobalTP(unsigned short gdata)
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
-unsigned
long DoubleBGR2RGB (unsigned long
BGR)
\r
+unsigned
int DoubleBGR2RGB (unsigned int
BGR)
\r
{
\r
{
\r
- unsigned
long
ebx,eax,edx;
\r
+ unsigned
int
ebx,eax,edx;
\r
\r
ebx=(BGR&0x000000ff)<<1;
\r
if(ebx&0x00000100) ebx=0x000000ff;
\r
\r
ebx=(BGR&0x000000ff)<<1;
\r
if(ebx&0x00000100) ebx=0x000000ff;
\r
@@
-166,7
+163,7
@@
unsigned long DoubleBGR2RGB (unsigned long BGR)
return (ebx|eax|edx);
\r
}
\r
\r
return (ebx|eax|edx);
\r
}
\r
\r
-unsigned short BGR24to16 (unsigned
long
BGR)
\r
+unsigned short BGR24to16 (unsigned
int
BGR)
\r
{
\r
return ((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6);
\r
}
\r
{
\r
return ((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6);
\r
}
\r
@@
-950,7
+947,7
@@
void SetZMask3NT(void)
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
- void SetRenderState(unsigned
long
DrawAttributes)
\r
+ void SetRenderState(unsigned
int
DrawAttributes)
\r
{
\r
bDrawNonShaded = (SHADETEXBIT(DrawAttributes)) ? TRUE : FALSE;
\r
DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
\r
{
\r
bDrawNonShaded = (SHADETEXBIT(DrawAttributes)) ? TRUE : FALSE;
\r
DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
\r
@@
-958,7
+955,7
@@
void SetZMask3NT(void)
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
- void SetRenderColor(unsigned
long
DrawAttributes)
\r
+ void SetRenderColor(unsigned
int
DrawAttributes)
\r
{
\r
if(bDrawNonShaded) {g_m1=g_m2=g_m3=128;}
\r
else
\r
{
\r
if(bDrawNonShaded) {g_m1=g_m2=g_m3=128;}
\r
else
\r
@@
-971,7
+968,7
@@
void SetZMask3NT(void)
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-void SetRenderMode(unsigned
long
DrawAttributes,BOOL bSCol)
\r
+void SetRenderMode(unsigned
int
DrawAttributes,BOOL bSCol)
\r
{
\r
if((bUseMultiPass) && (bDrawTextured) && !(bDrawNonShaded))
\r
{bDrawMultiPass = TRUE; SetSemiTransMulti(0);}
\r
{
\r
if((bUseMultiPass) && (bDrawTextured) && !(bDrawNonShaded))
\r
{bDrawMultiPass = TRUE; SetSemiTransMulti(0);}
\r
@@
-1027,7
+1024,7
@@
void SetRenderMode(unsigned long DrawAttributes,BOOL bSCol)
// Set Opaque multipass color
\r
////////////////////////////////////////////////////////////////////////
\r
\r
// Set Opaque multipass color
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-void SetOpaqueColor(unsigned
long
DrawAttributes)
\r
+void SetOpaqueColor(unsigned
int
DrawAttributes)
\r
{
\r
if(bDrawNonShaded) return; // no shading? bye
\r
\r
{
\r
if(bDrawNonShaded) return; // no shading? bye
\r
\r
@@
-1402,7
+1399,7
@@
BOOL CheckAgainstFrontScreen(short imageX0,short imageY0,short imageX1,short ima
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-void PrepareFullScreenUpload (
long
Position)
\r
+void PrepareFullScreenUpload (
int
Position)
\r
{
\r
if (Position==-1) // rgb24
\r
{
\r
{
\r
if (Position==-1) // rgb24
\r
{
\r
@@
-1484,7
+1481,7
@@
void PrepareFullScreenUpload (long Position)
\r
unsigned char * LoadDirectMovieFast(void);
\r
\r
\r
unsigned char * LoadDirectMovieFast(void);
\r
\r
-void UploadScreenEx(
long
Position)
\r
+void UploadScreenEx(
int
Position)
\r
{
\r
short ya,yb,xa,xb,x, y, YStep, XStep, U, UStep,ux[4],vy[4];
\r
\r
{
\r
short ya,yb,xa,xb,x, y, YStep, XStep, U, UStep,ux[4],vy[4];
\r
\r
@@
-1568,7
+1565,7
@@
void UploadScreenEx(long Position)
\r
////////////////////////////////////////////////////////////////////////
\r
\r
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-void UploadScreen(
long
Position)
\r
+void UploadScreen(
int
Position)
\r
{
\r
short x, y, YStep, XStep, U, s, UStep,ux[4],vy[4];
\r
short xa,xb,ya,yb;
\r
{
\r
short x, y, YStep, XStep, U, s, UStep,ux[4],vy[4];
\r
short xa,xb,ya,yb;
\r
@@
-1649,8
+1646,8
@@
void UploadScreen(long Position)
gl_vy[2] = gl_vy[3] = s;
\r
gl_ux[0] = gl_ux[3] = gl_vy[0] = gl_vy[1] = 0;
\r
\r
gl_vy[2] = gl_vy[3] = s;
\r
gl_ux[0] = gl_ux[3] = gl_vy[0] = gl_vy[1] = 0;
\r
\r
- SetRenderState((unsigned
long
)0x01000000);
\r
- SetRenderMode((unsigned
long
)0x01000000, FALSE); // upload texture data
\r
+ SetRenderState((unsigned
int
)0x01000000);
\r
+ SetRenderMode((unsigned
int
)0x01000000, FALSE); // upload texture data
\r
offsetScreenUpload(Position);
\r
assignTextureVRAMWrite();
\r
\r
offsetScreenUpload(Position);
\r
assignTextureVRAMWrite();
\r
\r
@@
-1715,7
+1712,7
@@
BOOL IsInsideNextScreen(short x, short y, short xoff, short yoff)
\r
void cmdSTP(unsigned char * baseAddr)
\r
{
\r
\r
void cmdSTP(unsigned char * baseAddr)
\r
{
\r
- unsigned
long gdata = ((unsigned long
*)baseAddr)[0];
\r
+ unsigned
int gdata = ((unsigned int
*)baseAddr)[0];
\r
\r
STATUSREG&=~0x1800; // clear the necessary bits
\r
STATUSREG|=((gdata & 0x03) << 11); // set the current bits
\r
\r
STATUSREG&=~0x1800; // clear the necessary bits
\r
STATUSREG|=((gdata & 0x03) << 11); // set the current bits
\r
@@
-1748,7
+1745,7
@@
void cmdSTP(unsigned char * baseAddr)
\r
void cmdTexturePage(unsigned char * baseAddr)
\r
{
\r
\r
void cmdTexturePage(unsigned char * baseAddr)
\r
{
\r
- unsigned
long gdata = ((unsigned long
*)baseAddr)[0];
\r
+ unsigned
int gdata = ((unsigned int
*)baseAddr)[0];
\r
UpdateGlobalTP((unsigned short)gdata);
\r
GlobalTextREST = (gdata&0x00ffffff)>>9;
\r
}
\r
UpdateGlobalTP((unsigned short)gdata);
\r
GlobalTextREST = (gdata&0x00ffffff)>>9;
\r
}
\r
@@
-1759,9
+1756,9
@@
void cmdTexturePage(unsigned char * baseAddr)
\r
void cmdTextureWindow(unsigned char *baseAddr)
\r
{
\r
\r
void cmdTextureWindow(unsigned char *baseAddr)
\r
{
\r
- unsigned
long gdata = ((unsigned long
*)baseAddr)[0];
\r
+ unsigned
int gdata = ((unsigned int
*)baseAddr)[0];
\r
\r
\r
- unsigned
long
YAlign,XAlign;
\r
+ unsigned
int
YAlign,XAlign;
\r
\r
ulGPUInfoVals[INFO_TW]=gdata&0xFFFFF;
\r
\r
\r
ulGPUInfoVals[INFO_TW]=gdata&0xFFFFF;
\r
\r
@@
-1795,8
+1792,8
@@
void cmdTextureWindow(unsigned char *baseAddr)
\r
// Re-calculate the bit field, because we can't trust what is passed in the data
\r
\r
\r
// Re-calculate the bit field, because we can't trust what is passed in the data
\r
\r
- YAlign = (unsigned
long
)(32 - (TWin.Position.y1 >> 3));
\r
- XAlign = (unsigned
long
)(32 - (TWin.Position.x1 >> 3));
\r
+ YAlign = (unsigned
int
)(32 - (TWin.Position.y1 >> 3));
\r
+ XAlign = (unsigned
int
)(32 - (TWin.Position.x1 >> 3));
\r
\r
// Absolute position of the start of the texture window
\r
\r
\r
// Absolute position of the start of the texture window
\r
\r
@@
-1968,7
+1965,7
@@
void ClampToPSXScreenOffset(short *x0, short *y0, short *x1, short *y1)
\r
void cmdDrawAreaStart(unsigned char * baseAddr)
\r
{
\r
\r
void cmdDrawAreaStart(unsigned char * baseAddr)
\r
{
\r
- unsigned
long gdata = ((unsigned long
*)baseAddr)[0];
\r
+ unsigned
int gdata = ((unsigned int
*)baseAddr)[0];
\r
\r
drawX = gdata & 0x3ff; // for soft drawing
\r
if(drawX>=1024) drawX=1023;
\r
\r
drawX = gdata & 0x3ff; // for soft drawing
\r
if(drawX>=1024) drawX=1023;
\r
@@
-1999,7
+1996,7
@@
void cmdDrawAreaStart(unsigned char * baseAddr)
\r
void cmdDrawAreaEnd(unsigned char * baseAddr)
\r
{
\r
\r
void cmdDrawAreaEnd(unsigned char * baseAddr)
\r
{
\r
- unsigned
long gdata = ((unsigned long
*)baseAddr)[0];
\r
+ unsigned
int gdata = ((unsigned int
*)baseAddr)[0];
\r
\r
drawW = gdata & 0x3ff; // for soft drawing
\r
if(drawW>=1024) drawW=1023;
\r
\r
drawW = gdata & 0x3ff; // for soft drawing
\r
if(drawW>=1024) drawW=1023;
\r
@@
-2034,7
+2031,7
@@
void cmdDrawAreaEnd(unsigned char * baseAddr)
\r
void cmdDrawOffset(unsigned char * baseAddr)
\r
{
\r
\r
void cmdDrawOffset(unsigned char * baseAddr)
\r
{
\r
- unsigned
long gdata = ((unsigned long
*)baseAddr)[0];
\r
+ unsigned
int gdata = ((unsigned int
*)baseAddr)[0];
\r
\r
PreviousPSXDisplay.DrawOffset.x =
\r
PSXDisplay.DrawOffset.x = (short)(gdata & 0x7ff);
\r
\r
PreviousPSXDisplay.DrawOffset.x =
\r
PSXDisplay.DrawOffset.x = (short)(gdata & 0x7ff);
\r
@@
-2244,7
+2241,7
@@
void primStoreImage(unsigned char * baseAddr)
\r
void primBlkFill(unsigned char * baseAddr)
\r
{
\r
\r
void primBlkFill(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
iDrawnSomething=1;
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
iDrawnSomething=1;
\r
@@
-2295,8
+2292,8
@@
void primBlkFill(unsigned char * baseAddr)
{
\r
bDrawTextured = FALSE;
\r
bDrawSmoothShaded = FALSE;
\r
{
\r
bDrawTextured = FALSE;
\r
bDrawSmoothShaded = FALSE;
\r
- SetRenderState((unsigned
long
)0x01000000);
\r
- SetRenderMode((unsigned
long
)0x01000000, FALSE);
\r
+ SetRenderState((unsigned
int
)0x01000000);
\r
+ SetRenderMode((unsigned
int
)0x01000000, FALSE);
\r
vertex[0].c.lcol=0xff000000;
\r
SETCOL(vertex[0]);
\r
if(ly0>pd->DisplayPosition.y)
\r
vertex[0].c.lcol=0xff000000;
\r
SETCOL(vertex[0]);
\r
if(ly0>pd->DisplayPosition.y)
\r
@@
-2323,8
+2320,8
@@
void primBlkFill(unsigned char * baseAddr)
{
\r
bDrawTextured = FALSE;
\r
bDrawSmoothShaded = FALSE;
\r
{
\r
bDrawTextured = FALSE;
\r
bDrawSmoothShaded = FALSE;
\r
- SetRenderState((unsigned
long
)0x01000000);
\r
- SetRenderMode((unsigned
long
)0x01000000, FALSE);
\r
+ SetRenderState((unsigned
int
)0x01000000);
\r
+ SetRenderMode((unsigned
int
)0x01000000, FALSE);
\r
vertex[0].c.lcol=gpuData[0]|0xff000000;
\r
SETCOL(vertex[0]);
\r
//glDisable(GL_SCISSOR_TEST); glError();
\r
vertex[0].c.lcol=gpuData[0]|0xff000000;
\r
SETCOL(vertex[0]);
\r
//glDisable(GL_SCISSOR_TEST); glError();
\r
@@
-2494,12
+2491,12
@@
void primMoveImage(unsigned char * baseAddr)
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- unsigned
long
*SRCPtr, *DSTPtr;
\r
+ unsigned
int
*SRCPtr, *DSTPtr;
\r
unsigned short LineOffset;
\r
int dx=imageSX>>1;
\r
\r
unsigned short LineOffset;
\r
int dx=imageSX>>1;
\r
\r
- SRCPtr = (unsigned
long
*)(psxVuw + (1024*imageY0) + imageX0);
\r
- DSTPtr = (unsigned
long
*)(psxVuw + (1024*imageY1) + imageX1);
\r
+ SRCPtr = (unsigned
int
*)(psxVuw + (1024*imageY0) + imageX0);
\r
+ DSTPtr = (unsigned
int
*)(psxVuw + (1024*imageY1) + imageX1);
\r
\r
LineOffset = 512 - dx;
\r
\r
\r
LineOffset = 512 - dx;
\r
\r
@@
-2600,7
+2597,7
@@
void primMoveImage(unsigned char * baseAddr)
\r
void primTileS(unsigned char * baseAddr)
\r
{
\r
\r
void primTileS(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*)baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*)baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
@@
-2665,7
+2662,7
@@
void primTileS(unsigned char * baseAddr)
\r
void primTile1(unsigned char * baseAddr)
\r
{
\r
\r
void primTile1(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*)baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*)baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
@@
-2712,7
+2709,7
@@
void primTile1(unsigned char * baseAddr)
\r
void primTile8(unsigned char * baseAddr)
\r
{
\r
\r
void primTile8(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*)baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*)baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
@@
-2759,7
+2756,7
@@
void primTile8(unsigned char * baseAddr)
\r
void primTile16(unsigned char * baseAddr)
\r
{
\r
\r
void primTile16(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*)baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*)baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
sprtX = sgpuData[2];
\r
@@
-2806,7
+2803,7
@@
void primTile16(unsigned char * baseAddr)
\r
/*void DrawMultiBlur(void)
\r
{
\r
\r
/*void DrawMultiBlur(void)
\r
{
\r
-
long
lABR,lDST;float fx,fy;
\r
+
int
lABR,lDST;float fx,fy;
\r
\r
lABR=GlobalTextABR;
\r
lDST=DrawSemiTrans;
\r
\r
lABR=GlobalTextABR;
\r
lDST=DrawSemiTrans;
\r
@@
-2839,7
+2836,7
@@
void primTile16(unsigned char * baseAddr)
\r
void DrawMultiFilterSprite(void)
\r
{
\r
\r
void DrawMultiFilterSprite(void)
\r
{
\r
-
long
lABR,lDST;
\r
+
int
lABR,lDST;
\r
\r
if(bUseMultiPass || DrawSemiTrans || ubOpaqueDraw)
\r
{
\r
\r
if(bUseMultiPass || DrawSemiTrans || ubOpaqueDraw)
\r
{
\r
@@
-2870,7
+2867,7
@@
void DrawMultiFilterSprite(void)
\r
void primSprt8(unsigned char * baseAddr)
\r
{
\r
\r
void primSprt8(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
short s;
\r
\r
short *sgpuData = ((short *) baseAddr);
\r
short s;
\r
\r
@@
-2991,7
+2988,7
@@
void primSprt8(unsigned char * baseAddr)
\r
void primSprt16(unsigned char * baseAddr)
\r
{
\r
\r
void primSprt16(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
short s;
\r
\r
short *sgpuData = ((short *) baseAddr);
\r
short s;
\r
\r
@@
-3111,7
+3108,7
@@
void primSprt16(unsigned char * baseAddr)
\r
void primSprtSRest(unsigned char * baseAddr,unsigned short type)
\r
{
\r
\r
void primSprtSRest(unsigned char * baseAddr,unsigned short type)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
short s;unsigned short sTypeRest=0;
\r
\r
short *sgpuData = ((short *) baseAddr);
\r
short s;unsigned short sTypeRest=0;
\r
\r
@@
-3282,7
+3279,7
@@
void primSprtSRest(unsigned char * baseAddr,unsigned short type)
\r
void primSprtS(unsigned char * baseAddr)
\r
{
\r
\r
void primSprtS(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
short s;unsigned short sTypeRest=0;
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
short s;unsigned short sTypeRest=0;
\r
@@
-3421,7
+3418,7
@@
void primSprtS(unsigned char * baseAddr)
\r
void primPolyF4(unsigned char *baseAddr)
\r
{
\r
\r
void primPolyF4(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-3516,7
+3513,7
@@
BOOL bCheckFF9G4(unsigned char * baseAddr)
\r
if(iFF9Fix==2)
\r
{
\r
\r
if(iFF9Fix==2)
\r
{
\r
-
long
labr=GlobalTextABR;
\r
+
int
labr=GlobalTextABR;
\r
GlobalTextABR=1;
\r
primPolyG4(pFF9G4Cache);
\r
GlobalTextABR=labr;
\r
GlobalTextABR=1;
\r
primPolyG4(pFF9G4Cache);
\r
GlobalTextABR=labr;
\r
@@
-3530,7
+3527,7
@@
BOOL bCheckFF9G4(unsigned char * baseAddr)
\r
void primPolyG4(unsigned char * baseAddr)
\r
{
\r
\r
void primPolyG4(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = (unsigned long
*)baseAddr;
\r
+ unsigned
int *gpuData = (unsigned int
*)baseAddr;
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-3581,7
+3578,7
@@
void primPolyG4(unsigned char * baseAddr)
// cmd: flat shaded Texture3
\r
////////////////////////////////////////////////////////////////////////
\r
\r
// cmd: flat shaded Texture3
\r
////////////////////////////////////////////////////////////////////////
\r
\r
-BOOL DoLineCheck(unsigned
long
* gpuData)
\r
+BOOL DoLineCheck(unsigned
int
* gpuData)
\r
{
\r
BOOL bQuad=FALSE;short dx,dy;
\r
\r
{
\r
BOOL bQuad=FALSE;short dx,dy;
\r
\r
@@
-3748,7
+3745,7
@@
BOOL DoLineCheck(unsigned long * gpuData)
\r
void primPolyFT3(unsigned char * baseAddr)
\r
{
\r
\r
void primPolyFT3(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-4184,7
+4181,7
@@
void RectTexAlign(void)
\r
void primPolyFT4(unsigned char * baseAddr)
\r
{
\r
\r
void primPolyFT4(unsigned char * baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-4272,7
+4269,7
@@
void primPolyFT4(unsigned char * baseAddr)
\r
void primPolyGT3(unsigned char *baseAddr)
\r
{
\r
\r
void primPolyGT3(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-4381,7
+4378,7
@@
void primPolyGT3(unsigned char *baseAddr)
\r
void primPolyG3(unsigned char *baseAddr)
\r
{
\r
\r
void primPolyG3(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-4426,7
+4423,7
@@
void primPolyG3(unsigned char *baseAddr)
\r
void primPolyGT4(unsigned char *baseAddr)
\r
{
\r
\r
void primPolyGT4(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-4546,7
+4543,7
@@
void primPolyGT4(unsigned char *baseAddr)
\r
void primPolyF3(unsigned char *baseAddr)
\r
{
\r
\r
void primPolyF3(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-4590,7
+4587,7
@@
void primPolyF3(unsigned char *baseAddr)
\r
void primLineGSkip(unsigned char *baseAddr)
\r
{
\r
\r
void primLineGSkip(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
int iMax=255;
\r
int i=2;
\r
short *sgpuData = ((short *) baseAddr);
\r
int iMax=255;
\r
int i=2;
\r
@@
-4615,7
+4612,7
@@
void primLineGSkip(unsigned char *baseAddr)
\r
void primLineGEx(unsigned char *baseAddr)
\r
{
\r
\r
void primLineGEx(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
int iMax=255;
\r
short cx0,cx1,cy0,cy1;int i;BOOL bDraw=TRUE;
\r
\r
int iMax=255;
\r
short cx0,cx1,cy0,cy1;int i;BOOL bDraw=TRUE;
\r
\r
@@
-4679,7
+4676,7
@@
void primLineGEx(unsigned char *baseAddr)
\r
void primLineG2(unsigned char *baseAddr)
\r
{
\r
\r
void primLineG2(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
@@
-4724,7
+4721,7
@@
void primLineG2(unsigned char *baseAddr)
\r
void primLineFSkip(unsigned char *baseAddr)
\r
{
\r
\r
void primLineFSkip(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
int i=2,iMax=255;
\r
\r
ly1 = (short)((gpuData[1]>>16) & 0xffff);
\r
int i=2,iMax=255;
\r
\r
ly1 = (short)((gpuData[1]>>16) & 0xffff);
\r
@@
-4744,7
+4741,7
@@
void primLineFSkip(unsigned char *baseAddr)
\r
void primLineFEx(unsigned char *baseAddr)
\r
{
\r
\r
void primLineFEx(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
int iMax;
\r
short cx0,cx1,cy0,cy1;int i;
\r
\r
int iMax;
\r
short cx0,cx1,cy0,cy1;int i;
\r
\r
@@
-4802,7
+4799,7
@@
void primLineFEx(unsigned char *baseAddr)
\r
void primLineF2(unsigned char *baseAddr)
\r
{
\r
\r
void primLineF2(unsigned char *baseAddr)
\r
{
\r
- unsigned
long *gpuData = ((unsigned long
*) baseAddr);
\r
+ unsigned
int *gpuData = ((unsigned int
*) baseAddr);
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r
short *sgpuData = ((short *) baseAddr);
\r
\r
lx0 = sgpuData[2];
\r