X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfxvideo%2Fgpu.c;h=f9a49bb8423154681ed74048f9a88f56bc025e83;hp=50d45d59660a380a79657ee1f43be44b288b8b3f;hb=55b0eeea6028e00741e620d28ab3211c49b8515f;hpb=f1bad6e15fb5d34fb7269936068fc2540b461a4f diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index 50d45d59..f9a49bb8 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -23,7 +23,6 @@ // memory image of the PSX vram //////////////////////////////////////////////////////////////////////// -unsigned char *psxVSecure; unsigned char *psxVub; signed char *psxVsb; unsigned short *psxVuw; @@ -51,6 +50,8 @@ DATAREGISTERMODES DataWriteMode; 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; @@ -59,6 +60,8 @@ long lSelectedSlot=0; BOOL bDoLazyUpdate=FALSE; uint32_t lGPUInfoVals[16]; static int iFakePrimBusy=0; +static uint32_t vBlank=0; +static const int *skip_advice; //////////////////////////////////////////////////////////////////////// // some misc external display funcs @@ -84,16 +87,15 @@ static void SetFixes(void) // 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; @@ -103,7 +105,7 @@ long CALLBACK GPUinit(void) // GPU INIT 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 @@ -181,7 +183,6 @@ long CALLBACK GPUclose() // GPU CLOSE long CALLBACK GPUshutdown(void) // GPU SHUTDOWN { CloseDisplay(); // shutdown direct draw - free(psxVSecure); return 0; // nothinh to do } @@ -204,22 +205,37 @@ static void updateDisplay(void) // UPDATE DISPLAY 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; - bDoVSyncUpdate=FALSE; // vsync done + lace_count_since_flip=0; + fskip_frameReady=!bSkipNextFrame; + + 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(); } //////////////////////////////////////////////////////////////////////// @@ -375,7 +391,7 @@ static void updateDisplayIfChanged(void) // UPDATE DISPLAY if(iFrameLimit==2) SetAutoFrameCap(); // -> set it - if(UseFrameSkip) updateDisplay(); // stupid stuff when frame skipping enabled + if(UseFrameSkip) decideSkip(); // stupid stuff when frame skipping enabled } //////////////////////////////////////////////////////////////////////// @@ -384,8 +400,8 @@ static void updateDisplayIfChanged(void) // UPDATE DISPLAY 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? @@ -393,6 +409,8 @@ void CALLBACK GPUupdateLace(void) // VSYNC if(PSXDisplay.Interlaced) // interlaced mode? { + lGPUstatusRet^=0x80000000; // odd/even bit? + if(bDoVSyncUpdate && PSXDisplay.DisplayMode.x>0 && PSXDisplay.DisplayMode.y>0) { updateDisplay(); @@ -402,20 +420,24 @@ void CALLBACK GPUupdateLace(void) // VSYNC { 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; + } + } } //////////////////////////////////////////////////////////////////////// @@ -450,7 +472,7 @@ uint32_t CALLBACK GPUreadStatus(void) // READ STATUS GPUIsReadyForCommands; } } - return lGPUstatusRet; + return lGPUstatusRet | vBlank; } //////////////////////////////////////////////////////////////////////// @@ -552,9 +574,9 @@ void CALLBACK GPUwriteStatus(uint32_t gdata) // WRITE STATUS if (!(PSXDisplay.Interlaced)) // stupid frame skipping option { - if(UseFrameSkip) updateDisplay(); if(dwActFixes&64) bDoLazyUpdate=TRUE; } + if(UseFrameSkip) decideSkip(); }return; //--------------------------------------------------// // setting width @@ -624,7 +646,7 @@ void CALLBACK GPUwriteStatus(uint32_t gdata) // WRITE STATUS } lGPUstatusRet|=GPUSTATUS_INTERLACED; } - else lGPUstatusRet&=~GPUSTATUS_INTERLACED; + else lGPUstatusRet&=~(GPUSTATUS_INTERLACED|0x80000000); if (PSXDisplay.PAL) lGPUstatusRet|=GPUSTATUS_PAL; @@ -1017,6 +1039,7 @@ long CALLBACK GPUdmaChain(uint32_t * baseAddrL, uint32_t addr) uint32_t dmaMem; unsigned char * baseAddrB; short count;unsigned int DMACommandCounter = 0; + long dmaWords = 0; GPUIsBusy; @@ -1031,6 +1054,7 @@ long CALLBACK GPUdmaChain(uint32_t * baseAddrL, uint32_t addr) if(CheckForEndlessLoop(addr)) break; count = baseAddrB[addr+3]; + dmaWords += 1 + count; dmaMem=addr+4; @@ -1042,7 +1066,7 @@ long CALLBACK GPUdmaChain(uint32_t * baseAddrL, uint32_t addr) GPUIsIdle; - return 0; + return dmaWords; } //////////////////////////////////////////////////////////////////////// @@ -1091,6 +1115,7 @@ long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF) // RESET TEXTURE STORE HERE, IF YOU USE SOMETHING LIKE THAT + PreviousPSXDisplay.Height = 0; GPUwriteStatus(ulStatusControl[0]); GPUwriteStatus(ulStatusControl[1]); GPUwriteStatus(ulStatusControl[2]); @@ -1103,3 +1128,29 @@ long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF) return 1; } + +void CALLBACK GPUvBlank(int val) +{ + vBlank=val?0x80000000:0; +} + +// 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); + + skip_advice = &cbs->fskip_advice; + fps_skip = 100.0f; + rcbs = cbs; +}