// memory image of the PSX vram
////////////////////////////////////////////////////////////////////////
-unsigned char *psxVSecure;
unsigned char *psxVub;
-signed char *psxVsb;
unsigned short *psxVuw;
unsigned short *psxVuw_eom;
-signed short *psxVsw;
-uint32_t *psxVul;
-int32_t *psxVsl;
////////////////////////////////////////////////////////////////////////
// GPU globals
DATAREGISTERMODES DataReadMode;
BOOL bSkipNextFrame = FALSE;
+BOOL fskip_frameReady;
+DWORD lace_count_since_flip;
DWORD dwLaceCnt=0;
short sDispWidths[8] = {256,320,512,640,368,384,512,640};
PSXDisplay_t PSXDisplay;
BOOL bDoLazyUpdate=FALSE;
uint32_t lGPUInfoVals[16];
static int iFakePrimBusy=0;
+static const int *skip_advice;
////////////////////////////////////////////////////////////////////////
// some misc external display funcs
// INIT, will be called after lib load... well, just do some var init...
////////////////////////////////////////////////////////////////////////
+// one extra MB for soft drawing funcs security
+static unsigned char vram[1024*512*2 + 1024*1024] __attribute__((aligned(2048)));
+
long CALLBACK GPUinit(void) // GPU INIT
{
memset(ulStatusControl,0,256*sizeof(uint32_t)); // init save state scontrol field
- psxVSecure = (unsigned char *)malloc((512*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security
- if (!psxVSecure)
- return -1;
-
//!!! ATTENTION !!!
- psxVub=psxVSecure + 512 * 1024; // security offset into double sized psx vram!
+ psxVub=vram + 512 * 1024; // security offset into double sized psx vram!
- psxVsb=(signed char *)psxVub; // different ways of accessing PSX VRAM
- psxVsw=(signed short *)psxVub;
- psxVsl=(int32_t *)psxVub;
psxVuw=(unsigned short *)psxVub;
- psxVul=(uint32_t *)psxVub;
-
psxVuw_eom=psxVuw+1024*512; // pre-calc of end of vram
- memset(psxVSecure,0x00,(512*2)*1024 + (1024*1024));
+ memset(vram,0x00,(512*2)*1024 + (1024*1024));
memset(lGPUInfoVals,0x00,16*sizeof(uint32_t));
PSXDisplay.RGB24 = FALSE; // init some stuff
long CALLBACK GPUshutdown(void) // GPU SHUTDOWN
{
CloseDisplay(); // shutdown direct draw
- free(psxVSecure);
return 0; // nothinh to do
}
if(UseFrameSkip) // skip ?
{
- if(!bSkipNextFrame) DoBufferSwap(); // -> to skip or not to skip
- if(dwActFixes&0xa0) // -> pc fps calculation fix/old skipping fix
+ if(fskip_frameReady)
{
- if((fps_skip < fFrameRateHz) && !(bSkipNextFrame)) // -> skip max one in a row
- {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
- else bSkipNextFrame = FALSE;
+ DoBufferSwap(); // -> to skip or not to skip
+ fskip_frameReady=FALSE;
+ bDoVSyncUpdate=FALSE; // vsync done
}
- else FrameSkip();
}
else // no skip ?
{
bSkipNextFrame = FALSE;
DoBufferSwap(); // -> swap
+ bDoVSyncUpdate=FALSE; // vsync done
}
+}
+
+static void decideSkip(void)
+{
+ if(!bDoVSyncUpdate)
+ return;
+
+ lace_count_since_flip=0;
+ fskip_frameReady=!bSkipNextFrame;
- bDoVSyncUpdate=FALSE; // vsync done
+ if(dwActFixes&0xa0) // -> pc fps calculation fix/old skipping fix
+ {
+ int skip = (skip_advice && *skip_advice) || UseFrameSkip == 1 || fps_skip < fFrameRateHz;
+ if(skip && !bSkipNextFrame) // -> skip max one in a row
+ {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
+ else bSkipNextFrame = FALSE;
+ }
+ else FrameSkip();
}
////////////////////////////////////////////////////////////////////////
if(iFrameLimit==2) SetAutoFrameCap(); // -> set it
- if(UseFrameSkip) updateDisplay(); // stupid stuff when frame skipping enabled
+ if(UseFrameSkip) decideSkip(); // stupid stuff when frame skipping enabled
}
////////////////////////////////////////////////////////////////////////
void CALLBACK GPUupdateLace(void) // VSYNC
{
- if(!(dwActFixes&1))
- lGPUstatusRet^=0x80000000; // odd/even bit
+ //if(!(dwActFixes&1))
+ // lGPUstatusRet^=0x80000000; // odd/even bit
//pcsx-rearmed: removed, this is handled by core
//if(!(dwActFixes&32)) // std fps limitation?
if(PSXDisplay.Interlaced) // interlaced mode?
{
+ lGPUstatusRet^=0x80000000; // odd/even bit?
+
if(bDoVSyncUpdate && PSXDisplay.DisplayMode.x>0 && PSXDisplay.DisplayMode.y>0)
{
updateDisplay();
{
if(dwActFixes&64) // lazy screen update fix
{
- if(bDoLazyUpdate && !UseFrameSkip)
+ if(bDoLazyUpdate)
updateDisplay();
bDoLazyUpdate=FALSE;
}
else
{
- if((bDoVSyncUpdate && !UseFrameSkip) // some primitives drawn?
- || bDoVSyncUpdate >= 8) // not syned for a while
+ if(bDoVSyncUpdate) // some primitives drawn?
updateDisplay(); // -> update display
}
}
- if(bDoVSyncUpdate) // if display not synced
- bDoVSyncUpdate++; // count how many times
+ if(UseFrameSkip) { // frame over-skip guard
+ lace_count_since_flip++;
+ if(lace_count_since_flip > 8) {
+ bSkipNextFrame=FALSE;
+ fskip_frameReady=TRUE;
+ }
+ }
}
////////////////////////////////////////////////////////////////////////
if (!(PSXDisplay.Interlaced)) // stupid frame skipping option
{
- if(UseFrameSkip) updateDisplay();
if(dwActFixes&64) bDoLazyUpdate=TRUE;
}
+ if(UseFrameSkip) decideSkip();
}return;
//--------------------------------------------------//
// setting width
}
lGPUstatusRet|=GPUSTATUS_INTERLACED;
}
- else lGPUstatusRet&=~GPUSTATUS_INTERLACED;
+ else lGPUstatusRet&=~(GPUSTATUS_INTERLACED|0x80000000);
if (PSXDisplay.PAL)
lGPUstatusRet|=GPUSTATUS_PAL;
if((gpuDataC==254 && gpuDataP>=3) ||
(gpuDataC==255 && gpuDataP>=4 && !(gpuDataP&1)))
{
- if((gpuDataM[gpuDataP] & 0xF000F000) == 0x50005000)
+ if((gpuDataM[gpuDataP] & HOST2LE32(0xF000F000)) == HOST2LE32(0x50005000))
gpuDataP=gpuDataC-1;
}
}
uint32_t dmaMem;
unsigned char * baseAddrB;
short count;unsigned int DMACommandCounter = 0;
+ long dmaWords = 0;
GPUIsBusy;
if(CheckForEndlessLoop(addr)) break;
count = baseAddrB[addr+3];
+ dmaWords += 1 + count;
dmaMem=addr+4;
if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);
addr = GETLE32(&baseAddrL[addr>>2])&0xffffff;
- }
- while (addr != 0xffffff);
+ } while (!(addr & 0x800000)); // contrary to some documentation, the end-of-linked-list marker is not actually 0xFF'FFFF
+ // any pointer with bit 23 set will do.
GPUIsIdle;
- return 0;
+ return dmaWords;
}
////////////////////////////////////////////////////////////////////////
// RESET TEXTURE STORE HERE, IF YOU USE SOMETHING LIKE THAT
+ PreviousPSXDisplay.Height = 0;
GPUwriteStatus(ulStatusControl[0]);
GPUwriteStatus(ulStatusControl[1]);
GPUwriteStatus(ulStatusControl[2]);
return 1;
}
+
+// rearmed thing
+#include "../../frontend/plugin_lib.h"
+
+const struct rearmed_cbs *rcbs;
+
+void GPUrearmedCallbacks(const struct rearmed_cbs *cbs)
+{
+ // sync config
+ UseFrameSkip = cbs->frameskip;
+ iUseDither = cbs->gpu_peops.iUseDither;
+ dwActFixes = cbs->gpu_peops.dwActFixes;
+ fFrameRateHz = cbs->gpu_peops.fFrameRateHz;
+ dwFrameRateTicks = cbs->gpu_peops.dwFrameRateTicks;
+ if (cbs->pl_vout_set_raw_vram)
+ cbs->pl_vout_set_raw_vram(psxVub);
+ if (cbs->pl_set_gpu_caps)
+ cbs->pl_set_gpu_caps(0);
+
+ skip_advice = &cbs->fskip_advice;
+ fps_skip = 100.0f;
+ rcbs = cbs;
+}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff