X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu_unai%2Fgpu.cpp;h=46552acd49402cc6325929960da1a79d65acfaa2;hp=a7cf495a67c3311af1d5307e745aab4da39d972d;hb=9ed4ca47610027e8a0448d61389df5a583bd659b;hpb=55b0eeea6028e00741e620d28ab3211c49b8515f

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index a7cf495a..46552acd 100644
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -107,12 +107,10 @@ u32   GPU_GP1;
 //  GPU Raster Macros
 #define	GPU_RGB16(rgb)        ((((rgb)&0xF80000)>>9)|(((rgb)&0xF800)>>6)|(((rgb)&0xF8)>>3))
 
-#define GPU_EXPANDSIGN_POLY(x)  (((s32)(x)<<20)>>20)
-//#define GPU_EXPANDSIGN_POLY(x)  (((s32)(x)<<21)>>21)
-#define GPU_EXPANDSIGN_SPRT(x)  (((s32)(x)<<21)>>21)
+#define GPU_EXPANDSIGN(x)  (((s32)(x)<<21)>>21)
 
-//#define	GPU_TESTRANGE(x)      { if((u32)(x+1024) > 2047) return; }
-#define	GPU_TESTRANGE(x)      { if ((x<-1023) || (x>1023)) return; }
+#define CHKMAX_X 1024
+#define CHKMAX_Y 512
 
 #define	GPU_SWAP(a,b,t)	{(t)=(a);(a)=(b);(b)=(t);}
 
@@ -274,8 +272,9 @@ void  GPU_writeDataMem(u32* dmaAddress, s32 dmaCount)
 	{
 		if (FrameToWrite) 
 		{
-			while (dmaCount--) 
+			while (dmaCount)
 			{
+				dmaCount--;
 				data = *dmaAddress++;
 				if ((&pvram[px])>(VIDEO_END)) pvram-=512*1024;
 				pvram[px] = data;
@@ -820,7 +819,7 @@ void  GPU_updateLace(void)
 #else
 
 #include "../../frontend/plugin_lib.h"
-#include "../../frontend/cspace.h"
+#include "../gpulib/cspace.h"
 
 extern "C" {
 
@@ -830,14 +829,15 @@ static s16 old_res_horz, old_res_vert, old_rgb24;
 
 static void blit(void)
 {
+	u16 *base = (u16 *)GPU_FrameBuffer;
 	s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
 	s16 h0, x0, y0, w0, h1;
-	u16 *srcs;
+	u32 fb_offs;
 	u8  *dest;
 
 	x0 = DisplayArea[0] & ~1; // alignment needed by blitter
 	y0 = DisplayArea[1];
-	srcs = &((u16*)GPU_FrameBuffer)[FRAME_OFFSET(x0,y0)];
+	fb_offs = FRAME_OFFSET(x0, y0);
 
 	w0 = DisplayArea[2];
 	h0 = DisplayArea[3];  // video mode
@@ -859,23 +859,29 @@ static void blit(void)
 
 	if (isRGB24)
 	{
-#ifndef MAEMO
-		for (; h1-- > 0; dest += w0 * 3, srcs += 1024)
+		if (!cbs->only_16bpp)
 		{
-			bgr888_to_rgb888(dest, srcs, w0 * 3);
+			for (; h1-- > 0; dest += w0 * 3, fb_offs += 1024)
+			{
+				fb_offs &= 1024*512-1;
+				bgr888_to_rgb888(dest, base + fb_offs, w0 * 3);
+			}
 		}
-#else
-		for (; h1-- > 0; dest += w0 * 2, srcs += 1024)
+		else
 		{
-			bgr888_to_rgb565(dest, srcs, w0 * 3);
+			for (; h1-- > 0; dest += w0 * 2, fb_offs += 1024)
+			{
+				fb_offs &= 1024*512-1;
+				bgr888_to_rgb565(dest, base + fb_offs, w0 * 3);
+			}
 		}
-#endif
 	}
 	else
 	{
-		for (; h1-- > 0; dest += w0 * 2, srcs += 1024)
+		for (; h1-- > 0; dest += w0 * 2, fb_offs += 1024)
 		{
-			bgr555_to_rgb565(dest, srcs, w0 * 2);
+			fb_offs &= 1024*512-1;
+			bgr555_to_rgb565(dest, base + fb_offs, w0 * 2);
 		}
 	}