X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfxvideo%2Fgpu.h;h=9ee5f3e6f7a4769e8cbdf70c0f49e9ad2db98dca;hp=b7b171e17dc2d5f3f0223140368d681b38180d9a;hb=8a55ebcc07d4f860633db8c77bb9e16bcfa03313;hpb=0d16cda294b8f4655dda849a526b336a5b46aa16

diff --git a/plugins/dfxvideo/gpu.h b/plugins/dfxvideo/gpu.h
index b7b171e1..9ee5f3e6 100644
--- a/plugins/dfxvideo/gpu.h
+++ b/plugins/dfxvideo/gpu.h
@@ -109,8 +109,8 @@
 #define PUTLE16(X, Y) do{*((uint16_t *)X)=HOST2LE16((uint16_t)Y);}while(0)
 #define PUTLE32_(X, Y) do{*((uint32_t *)X)=HOST2LE16((uint32_t)Y);}while(0)
 #ifdef __arm__
-#define GETLE32(X) (*(uint16_t *)X|(((uint16_t *)X)[1]<<16))
-#define PUTLE32(X, Y) do{*((uint16_t *)X)=(uint32_t)Y;((uint16_t *)X)[1]=(uint32_t)(Y)>>16;}while(0)
+#define GETLE32(X) (*(uint16_t *)(X)|(((uint16_t *)(X))[1]<<16))
+#define PUTLE32(X, Y) do{uint16_t *p_=(uint16_t *)(X);uint32_t y_=Y;p_[0]=y_;p_[1]=y_>>16;}while(0)
 #else
 #define GETLE32 GETLE32_
 #define PUTLE32 PUTLE32_
@@ -178,6 +178,7 @@ typedef struct RECTTAG
 typedef struct TWINTAG
 {
  PSXRect_t  Position;
+ int xmask, ymask;
 } TWin_t;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -207,7 +208,7 @@ typedef struct PSXDISPLAYTAG
 // draw.c
 
 extern int32_t           GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
-extern int32_t           GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
+extern int32_t           GlobalTextABR,GlobalTextPAGE;
 extern short          ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3;
 extern long           lLowerpart;
 extern BOOL           bCheckMask;
@@ -313,4 +314,7 @@ void          DoClearFrontBuffer(void);
 unsigned long ulInitDisplay(void);
 void          CloseDisplay(void);
 
+struct rearmed_cbs;
+extern const struct rearmed_cbs *rcbs;
+
 #endif