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
60dcaa4
..
1a3f25a
100644
(file)
--- a/
plugins/dfxvideo/gpu.c
+++ b/
plugins/dfxvideo/gpu.c
@@
-24,12
+24,8
@@
////////////////////////////////////////////////////////////////////////
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
@@
-96,12
+92,7
@@
long CALLBACK GPUinit(void) // GPU INIT
//!!! ATTENTION !!!
psxVub=vram + 512 * 1024; // security offset into double sized psx vram!
//!!! ATTENTION !!!
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
memset(vram,0x00,(512*2)*1024 + (1024*1024));
psxVuw_eom=psxVuw+1024*512; // pre-calc of end of vram
memset(vram,0x00,(512*2)*1024 + (1024*1024));
@@
-1060,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;