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
gpu_neon: don't crash on large primitives in enhancement mode
[pcsx_rearmed.git]
/
plugins
/
dfxvideo
/
gpu.c
diff --git
a/plugins/dfxvideo/gpu.c
b/plugins/dfxvideo/gpu.c
index
6af6447
..
1a3f25a
100644
(file)
--- a/
plugins/dfxvideo/gpu.c
+++ b/
plugins/dfxvideo/gpu.c
@@
-23,14
+23,9
@@
// memory image of the PSX vram
////////////////////////////////////////////////////////////////////////
// memory image of the PSX vram
////////////////////////////////////////////////////////////////////////
-unsigned char *psxVSecure;
unsigned char *psxVub;
unsigned char *psxVub;
-signed char *psxVsb;
unsigned short *psxVuw;
unsigned short *psxVuw_eom;
unsigned short *psxVuw;
unsigned short *psxVuw_eom;
-signed short *psxVsw;
-uint32_t *psxVul;
-int32_t *psxVsl;
////////////////////////////////////////////////////////////////////////
// GPU globals
////////////////////////////////////////////////////////////////////////
// GPU globals
@@
-61,7
+56,6
@@
long lSelectedSlot=0;
BOOL bDoLazyUpdate=FALSE;
uint32_t lGPUInfoVals[16];
static int iFakePrimBusy=0;
BOOL bDoLazyUpdate=FALSE;
uint32_t lGPUInfoVals[16];
static int iFakePrimBusy=0;
-static uint32_t vBlank=0;
static const int *skip_advice;
////////////////////////////////////////////////////////////////////////
static const int *skip_advice;
////////////////////////////////////////////////////////////////////////
@@
-88,26
+82,20
@@
static void SetFixes(void)
// INIT, will be called after lib load... well, just do some var init...
////////////////////////////////////////////////////////////////////////
// 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
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 !!!
//!!! 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;
psxVuw=(unsigned short *)psxVub;
- psxVul=(uint32_t *)psxVub;
-
psxVuw_eom=psxVuw+1024*512; // pre-calc of end of vram
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
memset(lGPUInfoVals,0x00,16*sizeof(uint32_t));
PSXDisplay.RGB24 = FALSE; // init some stuff
@@
-185,7
+173,6
@@
long CALLBACK GPUclose() // GPU CLOSE
long CALLBACK GPUshutdown(void) // GPU SHUTDOWN
{
CloseDisplay(); // shutdown direct draw
long CALLBACK GPUshutdown(void) // GPU SHUTDOWN
{
CloseDisplay(); // shutdown direct draw
- free(psxVSecure);
return 0; // nothinh to do
}
return 0; // nothinh to do
}
@@
-233,7
+220,7
@@
static void decideSkip(void)
if(dwActFixes&0xa0) // -> pc fps calculation fix/old skipping fix
{
if(dwActFixes&0xa0) // -> pc fps calculation fix/old skipping fix
{
- int skip = (skip_advice && *skip_advice) || fps_skip < fFrameRateHz;
+ 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;
if(skip && !bSkipNextFrame) // -> skip max one in a row
{bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
else bSkipNextFrame = FALSE;
@@
-475,7
+462,7
@@
uint32_t CALLBACK GPUreadStatus(void) // READ STATUS
GPUIsReadyForCommands;
}
}
GPUIsReadyForCommands;
}
}
- return lGPUstatusRet
| vBlank
;
+ return lGPUstatusRet;
}
////////////////////////////////////////////////////////////////////////
}
////////////////////////////////////////////////////////////////////////
@@
-989,7
+976,7
@@
ENDVRAM:
if((gpuDataC==254 && gpuDataP>=3) ||
(gpuDataC==255 && gpuDataP>=4 && !(gpuDataP&1)))
{
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;
}
}
gpuDataP=gpuDataC-1;
}
}
@@
-1064,8
+1051,8
@@
long CALLBACK GPUdmaChain(uint32_t * baseAddrL, uint32_t addr)
if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);
addr = GETLE32(&baseAddrL[addr>>2])&0xffffff;
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;
GPUIsIdle;
@@
-1118,6
+1105,7
@@
long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)
// RESET TEXTURE STORE HERE, IF YOU USE SOMETHING LIKE THAT
// RESET TEXTURE STORE HERE, IF YOU USE SOMETHING LIKE THAT
+ PreviousPSXDisplay.Height = 0;
GPUwriteStatus(ulStatusControl[0]);
GPUwriteStatus(ulStatusControl[1]);
GPUwriteStatus(ulStatusControl[2]);
GPUwriteStatus(ulStatusControl[0]);
GPUwriteStatus(ulStatusControl[1]);
GPUwriteStatus(ulStatusControl[2]);
@@
-1131,11
+1119,6
@@
long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)
return 1;
}
return 1;
}
-void CALLBACK GPUvBlank(int val)
-{
- vBlank=val?0x80000000:0;
-}
-
// rearmed thing
#include "../../frontend/plugin_lib.h"
// rearmed thing
#include "../../frontend/plugin_lib.h"
@@
-1149,6
+1132,10
@@
void GPUrearmedCallbacks(const struct rearmed_cbs *cbs)
dwActFixes = cbs->gpu_peops.dwActFixes;
fFrameRateHz = cbs->gpu_peops.fFrameRateHz;
dwFrameRateTicks = cbs->gpu_peops.dwFrameRateTicks;
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;
skip_advice = &cbs->fskip_advice;
fps_skip = 100.0f;