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=a7cf495a67c3311af1d5307e745aab4da39d972d;hp=ea983645cef78d448fd7cafc8ef013337dc3fac8;hb=55b0eeea6028e00741e620d28ab3211c49b8515f;hpb=53636f1583b53672d6908eff1aeff7213ee11e34

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index ea983645..a7cf495a 100644
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -29,6 +29,7 @@ int linesInterlace = 0;  /* internal lines interlace */
 int linesInterlace_user = 0; /* Lines interlace */
 
 bool isSkip = false; /* skip frame (info coming from GPU) */
+bool wasSkip = false;
 bool skipFrame = false; /* skip frame (according to frame skip) */
 bool alt_fps = false; /* Alternative FPS algorithm */
 bool show_fps = false; /* Show FPS statistics */
@@ -95,7 +96,7 @@ u32   tInc, tMsk;
 
 GPUPacket PacketBuffer;
 // FRAME_BUFFER_SIZE is defined in bytes; 512K is guard memory for out of range reads
-u16   GPU_FrameBuffer[(FRAME_BUFFER_SIZE+512*1024)/2] __attribute__((aligned(16)));
+u16   GPU_FrameBuffer[(FRAME_BUFFER_SIZE+512*1024)/2] __attribute__((aligned(2048)));
 u32   GPU_GP1;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -551,6 +552,11 @@ void  GPU_writeStatus(u32 data)
 		DisplayArea[0] = (data & 0x000003FF); //(short)(data & 0x3ff);
 		DisplayArea[1] = ((data & 0x0007FC00)>>10); //(data & 0x000FFC00) >> 10; //(short)((data>>10)&0x1ff);
 		fb_dirty = true;
+		wasSkip = isSkip;
+		if (isSkip)
+			isSkip = false;
+		else
+			isSkip = skipFrame;
 		break;
 	case 0x07:
 		DisplayArea[4] = data & 0x000003FF; //(short)(data & 0x3ff);
@@ -814,16 +820,16 @@ void  GPU_updateLace(void)
 #else
 
 #include "../../frontend/plugin_lib.h"
-#include "../../frontend/arm_utils.h"
+#include "../../frontend/cspace.h"
 
 extern "C" {
 
 static const struct rearmed_cbs *cbs;
 static void *screen_buf;
+static s16 old_res_horz, old_res_vert, old_rgb24;
 
 static void blit(void)
 {
-	static s16 old_res_horz, old_res_vert, old_rgb24;
 	s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
 	s16 h0, x0, y0, w0, h1;
 	u16 *srcs;
@@ -876,6 +882,29 @@ static void blit(void)
 	screen_buf = cbs->pl_vout_flip();
 }
 
+static void blit_raw(void)
+{
+	s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
+	s16 h0, w0, h1;
+
+	w0 = DisplayArea[2];
+	h0 = DisplayArea[3];  // video mode
+	h1 = DisplayArea[5] - DisplayArea[4]; // display needed
+	if (h0 == 480) h1 = Min2(h1*2,480);
+
+	if (h1 <= 0)
+		return;
+
+	if (w0 != old_res_horz || h1 != old_res_vert || isRGB24 != old_rgb24)
+	{
+		old_res_horz = w0;
+		old_res_vert = h1;
+		old_rgb24 = (s16)isRGB24;
+		screen_buf = cbs->pl_vout_set_mode(w0, h1, isRGB24 ? 24 : 16);
+	}
+	cbs->pl_vout_raw_flip(DisplayArea[0], DisplayArea[1]);
+}
+
 void GPU_updateLace(void)
 {
 	// Interlace bit toggle
@@ -884,15 +913,21 @@ void GPU_updateLace(void)
 	if (!fb_dirty || (GPU_GP1&0x08800000))
 		return;
 
-	if (!isSkip) {
-		blit();
-
+	if (!wasSkip) {
+		if (cbs->pl_vout_raw_flip != NULL)
+			blit_raw();
+		else
+			blit();
 		fb_dirty = false;
-		if (cbs->fskip_advice)
-			isSkip = true;
+		skCount = 0;
 	}
-	else
-		isSkip = false;
+	else {
+		skCount++;
+		if (skCount >= 8)
+			wasSkip = isSkip = 0;
+	}
+
+	skipFrame = cbs->fskip_advice || cbs->frameskip == 1;
 }
 
 long GPUopen(unsigned long *, char *, char *)
@@ -921,6 +956,8 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_)
 	enableAbbeyHack = cbs_->gpu_unai.abe_hack;
 	light = !cbs_->gpu_unai.no_light;
 	blend = !cbs_->gpu_unai.no_blend;
+	if (cbs_->pl_vout_set_raw_vram)
+		cbs_->pl_vout_set_raw_vram((void *)GPU_FrameBuffer);
 
 	cbs = cbs_;
 }