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
try to ensure fbdev buffer is valid
[pcsx_rearmed.git]
/
plugins
/
gpu_unai
/
gpu.cpp
diff --git
a/plugins/gpu_unai/gpu.cpp
b/plugins/gpu_unai/gpu.cpp
index
991610c
..
3e69aaa
100644
(file)
--- a/
plugins/gpu_unai/gpu.cpp
+++ b/
plugins/gpu_unai/gpu.cpp
@@
-40,6
+40,8
@@
bool frameLimit = false; /* frames to wait */
bool light = true; /* lighting */
bool blend = true; /* blending */
bool light = true; /* lighting */
bool blend = true; /* blending */
+bool fb_dirty = false;
+
bool enableAbbeyHack = false; /* Abe's Odyssey hack */
u8 BLEND_MODE;
u8 TEXT_MODE;
bool enableAbbeyHack = false; /* Abe's Odyssey hack */
u8 BLEND_MODE;
u8 TEXT_MODE;
@@
-298,6
+300,7
@@
void GPU_writeDataMem(u32* dmaAddress, s32 dmaCount)
}
GPU_GP1 = (GPU_GP1 | 0x14000000) & ~0x60000000;
}
GPU_GP1 = (GPU_GP1 | 0x14000000) & ~0x60000000;
+ fb_dirty = true;
pcsx4all_prof_end_with_resume(PCSX4ALL_PROF_GPU,PCSX4ALL_PROF_HW_WRITE);
pcsx4all_prof_resume(PCSX4ALL_PROF_CPU);
}
pcsx4all_prof_end_with_resume(PCSX4ALL_PROF_GPU,PCSX4ALL_PROF_HW_WRITE);
pcsx4all_prof_resume(PCSX4ALL_PROF_CPU);
}
@@
-390,6
+393,7
@@
void GPU_writeData(u32 data)
gpuCheckPacket(data);
}
GPU_GP1 |= 0x14000000;
gpuCheckPacket(data);
}
GPU_GP1 |= 0x14000000;
+ fb_dirty = true;
pcsx4all_prof_end_with_resume(PCSX4ALL_PROF_GPU,PCSX4ALL_PROF_HW_WRITE);
pcsx4all_prof_resume(PCSX4ALL_PROF_CPU);
pcsx4all_prof_end_with_resume(PCSX4ALL_PROF_GPU,PCSX4ALL_PROF_HW_WRITE);
pcsx4all_prof_resume(PCSX4ALL_PROF_CPU);
@@
-529,10
+533,12
@@
void GPU_writeStatus(u32 data)
case 0x05:
DisplayArea[0] = (data & 0x000003FF); //(short)(data & 0x3ff);
DisplayArea[1] = ((data & 0x0007FC00)>>10); //(data & 0x000FFC00) >> 10; //(short)((data>>10)&0x1ff);
case 0x05:
DisplayArea[0] = (data & 0x000003FF); //(short)(data & 0x3ff);
DisplayArea[1] = ((data & 0x0007FC00)>>10); //(data & 0x000FFC00) >> 10; //(short)((data>>10)&0x1ff);
+ fb_dirty = true;
break;
case 0x07:
DisplayArea[4] = data & 0x000003FF; //(short)(data & 0x3ff);
DisplayArea[5] = (data & 0x000FFC00) >> 10; //(short)((data>>10) & 0x3ff);
break;
case 0x07:
DisplayArea[4] = data & 0x000003FF; //(short)(data & 0x3ff);
DisplayArea[5] = (data & 0x000FFC00) >> 10; //(short)((data>>10) & 0x3ff);
+ fb_dirty = true;
break;
case 0x08:
{
break;
case 0x08:
{
@@
-543,6
+549,7
@@
void GPU_writeStatus(u32 data)
DisplayArea[3] = VerticalResolution[(GPU_GP1 >> 19) & 3];
isPAL = (data & 0x08) ? true : false; // if 1 - PAL mode, else NTSC
}
DisplayArea[3] = VerticalResolution[(GPU_GP1 >> 19) & 3];
isPAL = (data & 0x08) ? true : false; // if 1 - PAL mode, else NTSC
}
+ fb_dirty = true;
break;
case 0x10:
switch (data & 0xffff) {
break;
case 0x10:
switch (data & 0xffff) {
@@
-857,8
+864,8
@@
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;
static s16 old_res_horz, old_res_vert, old_rgb24;
s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
s16 h0, x0, y0, w0, h1;
- u8 *dest = (u8 *)screen_buf;
u16 *srcs;
u16 *srcs;
+ u8 *dest;
x0 = DisplayArea[0] & ~3; // alignment needed by blitter
y0 = DisplayArea[1];
x0 = DisplayArea[0] & ~3; // alignment needed by blitter
y0 = DisplayArea[1];
@@
-870,13
+877,17
@@
static void blit(void)
h1 = DisplayArea[5] - DisplayArea[4]; // display needed
if (h0 == 480) h1 = Min2(h1*2,480);
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;
if (w0 != old_res_horz || h1 != old_res_vert || isRGB24 != old_rgb24)
{
old_res_horz = w0;
old_res_vert = h1;
old_rgb24 = (s16)isRGB24;
- cbs->pl_fbdev_set_mode(w0, h1, isRGB24 ? 24 : 16);
+
screen_buf =
cbs->pl_fbdev_set_mode(w0, h1, isRGB24 ? 24 : 16);
}
}
+ dest = (u8 *)screen_buf;
if (isRGB24)
{
if (isRGB24)
{
@@
-901,8
+912,18
@@
void GPU_updateLace(void)
// Interlace bit toggle
GPU_GP1 ^= 0x80000000;
// Interlace bit toggle
GPU_GP1 ^= 0x80000000;
- if (!((GPU_GP1&0x08000000) || (GPU_GP1&0x00800000)))
+ if (!fb_dirty || (GPU_GP1&0x08800000))
+ return;
+
+ if (!isSkip) {
blit();
blit();
+
+ fb_dirty = false;
+ if (*cbs->fskip_option)
+ isSkip = true;
+ }
+ else
+ isSkip = false;
}
long GPUopen(unsigned long *, char *, char *)
}
long GPUopen(unsigned long *, char *, char *)