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
Fix for compiling it against newer zlib versions.
[pcsx_rearmed.git]
/
plugins
/
dfxvideo
/
prim.c
diff --git
a/plugins/dfxvideo/prim.c
b/plugins/dfxvideo/prim.c
index
b36d556
..
7a71d4c
100644
(file)
--- a/
plugins/dfxvideo/prim.c
+++ b/
plugins/dfxvideo/prim.c
@@
-348,7
+348,6
@@
static void cmdTexturePage(unsigned char * baseAddr)
usMirror=gdata&0x3000;
UpdateGlobalTP((unsigned short)gdata);
usMirror=gdata&0x3000;
UpdateGlobalTP((unsigned short)gdata);
- GlobalTextREST = (gdata&0x00ffffff)>>9;
}
////////////////////////////////////////////////////////////////////////
}
////////////////////////////////////////////////////////////////////////
@@
-375,6
+374,7
@@
static void cmdTextureWindow(unsigned char *baseAddr)
TWin.Position.y1 = 128; // 10000
else
TWin.Position.y1 = 256; // 00000
TWin.Position.y1 = 128; // 10000
else
TWin.Position.y1 = 256; // 00000
+ TWin.ymask = TWin.Position.y1 - 1;
// Texture window size is determined by the least bit set of the relevant 5 bits
// Texture window size is determined by the least bit set of the relevant 5 bits
@@
-390,6
+390,7
@@
static void cmdTextureWindow(unsigned char *baseAddr)
TWin.Position.x1 = 128; // 10000
else
TWin.Position.x1 = 256; // 00000
TWin.Position.x1 = 128; // 10000
else
TWin.Position.x1 = 256; // 00000
+ TWin.xmask = TWin.Position.x1 - 1;
// Re-calculate the bit field, because we can't trust what is passed in the data
// Re-calculate the bit field, because we can't trust what is passed in the data
@@
-574,7
+575,7
@@
static void primMoveImage(unsigned char * baseAddr)
return;
}
return;
}
- if(
imageSX&1)
// not dword aligned? slower func
+ if(
(imageSX|imageX0|imageX1)&1)
// not dword aligned? slower func
{
unsigned short *SRCPtr, *DSTPtr;
unsigned short LineOffset;
{
unsigned short *SRCPtr, *DSTPtr;
unsigned short LineOffset;