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=3515814322239f6a18f6ff7798e6760beb46cd9b;hp=abe76389216982cf9926c8956137e7c41d3a1e34;hb=76f7048eff4f5357df048268e40b5bc6b9387fe5;hpb=83a79d01995051a2778784887d086689ff815667

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index abe76389..35158143 100644
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -184,9 +184,13 @@ long  GPU_freeze(unsigned int bWrite, GPUFreeze_t* p2)
 	{
 		p2->GPU_gp1 = GPU_GP1;
 		memset(p2->Control, 0, sizeof(p2->Control));
-		p2->Control[5] = DisplayArea[0] | (DisplayArea[1] << 10);
-		p2->Control[7] = DisplayArea[4] | (DisplayArea[5] << 10);
-		p2->Control[8] = ((GPU_GP1 >> 17) & 0x3f) | ((GPU_GP1 >> 10) & 0x40);
+		// save resolution and registers for P.E.Op.S. compatibility
+		p2->Control[3] = (3 << 24) | ((GPU_GP1 >> 23) & 1);
+		p2->Control[4] = (4 << 24) | ((GPU_GP1 >> 29) & 3);
+		p2->Control[5] = (5 << 24) | (DisplayArea[0] | (DisplayArea[1] << 10));
+		p2->Control[6] = (6 << 24) | (2560 << 12);
+		p2->Control[7] = (7 << 24) | (DisplayArea[4] | (DisplayArea[5] << 10));
+		p2->Control[8] = (8 << 24) | ((GPU_GP1 >> 17) & 0x3f) | ((GPU_GP1 >> 10) & 0x40);
 		memcpy(p2->FrameBuffer, (u16*)GPU_FrameBuffer, FRAME_BUFFER_SIZE);
 		return (1);
 	}
@@ -327,7 +331,7 @@ INLINE int CheckForEndlessLoop(u32 *laddr)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void  GPU_dmaChain(u32* baseAddr, u32 dmaVAddr)
+long GPU_dmaChain(u32* baseAddr, u32 dmaVAddr)
 {
 #ifdef DEBUG_ANALYSIS
 	dbg_anacnt_GPU_dmaChain++;
@@ -335,6 +339,7 @@ void  GPU_dmaChain(u32* baseAddr, u32 dmaVAddr)
 	pcsx4all_prof_start_with_pause(PCSX4ALL_PROF_GPU,PCSX4ALL_PROF_HW_WRITE);
 	u32 data, *address, count, offset;
 	unsigned int DMACommandCounter = 0;
+	long dma_words = 0;
 
 	GPU_GP1 &= ~0x14000000;
 	lUsedAddr[0]=lUsedAddr[1]=lUsedAddr[2]=(u32*)0x1fffff;
@@ -351,9 +356,12 @@ void  GPU_dmaChain(u32* baseAddr, u32 dmaVAddr)
 		else dmaVAddr = 0x1FFFFF;
 
 		if(count>0) GPU_writeDataMem(address,count);
+		dma_words += 1 + count;
 	}
 	GPU_GP1 = (GPU_GP1 | 0x14000000) & ~0x60000000;
 	pcsx4all_prof_end_with_resume(PCSX4ALL_PROF_GPU,PCSX4ALL_PROF_HW_WRITE);
+
+	return dma_words;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -860,11 +868,10 @@ void  GPU_updateLace(void)
 #else
 
 #include "../../frontend/plugin_lib.h"
+#include "../../frontend/arm_utils.h"
 
 extern "C" {
 
-extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
-extern void bgr888_to_rgb888(void *dst, void *src, int bytes);
 static const struct rearmed_cbs *cbs;
 static void *screen_buf;
 
@@ -876,7 +883,7 @@ static void blit(void)
 	u16 *srcs;
 	u8  *dest;
 
-	x0 = DisplayArea[0] & ~3; // alignment needed by blitter
+	x0 = DisplayArea[0] & ~1; // alignment needed by blitter
 	y0 = DisplayArea[1];
 	srcs = &((u16*)GPU_FrameBuffer)[FRAME_OFFSET(x0,y0)];
 
@@ -894,16 +901,23 @@ static void blit(void)
 		old_res_horz = w0;
 		old_res_vert = h1;
 		old_rgb24 = (s16)isRGB24;
-		screen_buf = cbs->pl_fbdev_set_mode(w0, h1, isRGB24 ? 24 : 16);
+		screen_buf = cbs->pl_vout_set_mode(w0, h1, isRGB24 ? 24 : 16);
 	}
 	dest = (u8 *)screen_buf;
 
 	if (isRGB24)
 	{
+#ifndef MAEMO
 		for (; h1-- > 0; dest += w0 * 3, srcs += 1024)
 		{
 			bgr888_to_rgb888(dest, srcs, w0 * 3);
 		}
+#else
+		for (; h1-- > 0; dest += w0 * 2, srcs += 1024)
+		{
+			bgr888_to_rgb565(dest, srcs, w0 * 3);
+		}
+#endif
 	}
 	else
 	{
@@ -913,7 +927,7 @@ static void blit(void)
 		}
 	}
 
-	screen_buf = cbs->pl_fbdev_flip();
+	screen_buf = cbs->pl_vout_flip();
 }
 
 void GPU_updateLace(void)
@@ -928,7 +942,7 @@ void GPU_updateLace(void)
 		blit();
 
 		fb_dirty = false;
-		if (*cbs->fskip_option)
+		if (cbs->fskip_advice)
 			isSkip = true;
 	}
 	else
@@ -937,14 +951,14 @@ void GPU_updateLace(void)
 
 long GPUopen(unsigned long *, char *, char *)
 {
-	cbs->pl_fbdev_open();
-	screen_buf = cbs->pl_fbdev_flip();
+	cbs->pl_vout_open();
+	screen_buf = cbs->pl_vout_flip();
 	return 0;
 }
 
 long GPUclose(void)
 {
-	cbs->pl_fbdev_close();
+	cbs->pl_vout_close();
 	return 0;
 }