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
dfxvideo: Restore support for big-endian arch
[pcsx_rearmed.git]
/
plugins
/
dfxvideo
/
gpulib_if.c
diff --git
a/plugins/dfxvideo/gpulib_if.c
b/plugins/dfxvideo/gpulib_if.c
index
6f425bd
..
c4e4cfe
100644
(file)
--- a/
plugins/dfxvideo/gpulib_if.c
+++ b/
plugins/dfxvideo/gpulib_if.c
@@
-37,10
+37,10
@@
// byteswappings
// byteswappings
-#define SWAP16(x)
({ uint16_t y=(x); (((y)>>8 & 0xff) | ((y)<<8 & 0xff00)); }
)
-#define SWAP32(x)
({ uint32_t y=(x); (((y)>>24 & 0xfful) | ((y)>>8 & 0xff00ul) | ((y)<<8 & 0xff0000ul) | ((y)<<24 & 0xff000000ul)); }
)
+#define SWAP16(x)
__builtin_bswap16(x
)
+#define SWAP32(x)
__builtin_bswap32(x
)
-#if
def _
_BIG_ENDIAN__
+#if
__BYTE_ORDER__ == __ORDER
_BIG_ENDIAN__
// big endian config
#define HOST2LE32(x) SWAP32(x)
// big endian config
#define HOST2LE32(x) SWAP32(x)
@@
-75,7
+75,7
@@
#define GETLE32_(X) LE2HOST32(*(uint32_t *)X)
#define GETLE16D(X) ({uint32_t val = GETLE32(X); (val<<16 | val >> 16);})
#define PUTLE16(X, Y) do{*((uint16_t *)X)=HOST2LE16((uint16_t)Y);}while(0)
#define GETLE32_(X) LE2HOST32(*(uint32_t *)X)
#define GETLE16D(X) ({uint32_t val = GETLE32(X); (val<<16 | val >> 16);})
#define PUTLE16(X, Y) do{*((uint16_t *)X)=HOST2LE16((uint16_t)Y);}while(0)
-#define PUTLE32_(X, Y) do{*((uint32_t *)X)=HOST2LE
16
((uint32_t)Y);}while(0)
+#define PUTLE32_(X, Y) do{*((uint32_t *)X)=HOST2LE
32
((uint32_t)Y);}while(0)
#ifdef __arm__
#define GETLE32(X) (*(uint16_t *)(X)|(((uint16_t *)(X))[1]<<16))
#define PUTLE32(X, Y) do{uint16_t *p_=(uint16_t *)(X);uint32_t y_=Y;p_[0]=y_;p_[1]=y_>>16;}while(0)
#ifdef __arm__
#define GETLE32(X) (*(uint16_t *)(X)|(((uint16_t *)(X))[1]<<16))
#define PUTLE32(X, Y) do{uint16_t *p_=(uint16_t *)(X);uint32_t y_=Y;p_[0]=y_;p_[1]=y_>>16;}while(0)
@@
-219,18
+219,12
@@
extern int32_t drawH;
#define KEY_BADTEXTURES 128
#define KEY_CHECKTHISOUT 256
#define KEY_BADTEXTURES 128
#define KEY_CHECKTHISOUT 256
-#if !defined(__BIG_ENDIAN__) || defined(__x86_64__) || defined(__i386__)
-#ifndef __LITTLE_ENDIAN__
-#define __LITTLE_ENDIAN__
-#endif
-#endif
-
-#ifdef __LITTLE_ENDIAN__
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define RED(x) (x & 0xff)
#define BLUE(x) ((x>>16) & 0xff)
#define GREEN(x) ((x>>8) & 0xff)
#define COLOR(x) (x & 0xffffff)
#define RED(x) (x & 0xff)
#define BLUE(x) ((x>>16) & 0xff)
#define GREEN(x) ((x>>8) & 0xff)
#define COLOR(x) (x & 0xffffff)
-#el
if defined __BIG_ENDIAN__
+#el
se
#define RED(x) ((x>>24) & 0xff)
#define BLUE(x) ((x>>8) & 0xff)
#define GREEN(x) ((x>>16) & 0xff)
#define RED(x) ((x>>24) & 0xff)
#define BLUE(x) ((x>>8) & 0xff)
#define GREEN(x) ((x>>16) & 0xff)
@@
-260,14
+254,18
@@
unsigned short sSetMask = 0;
unsigned long lSetMask = 0;
long lLowerpart;
unsigned long lSetMask = 0;
long lLowerpart;
+#if defined(__GNUC__) && __GNUC__ >= 6
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+
#include "soft.c"
#include "prim.c"
/////////////////////////////////////////////////////////////////////////////
#include "soft.c"
#include "prim.c"
/////////////////////////////////////////////////////////////////////////////
-
int renderer_init(void
)
+
static void set_vram(void *vram
)
{
{
- psxVub=
(void *)gpu.
vram;
+ psxVub=vram;
psxVsb=(signed char *)psxVub; // different ways of accessing PSX VRAM
psxVsw=(signed short *)psxVub;
psxVsb=(signed char *)psxVub; // different ways of accessing PSX VRAM
psxVsw=(signed short *)psxVub;
@@
-276,6
+274,11
@@
int renderer_init(void)
psxVul=(uint32_t *)psxVub;
psxVuw_eom=psxVuw+1024*512; // pre-calc of end of vram
psxVul=(uint32_t *)psxVub;
psxVuw_eom=psxVuw+1024*512; // pre-calc of end of vram
+}
+
+int renderer_init(void)
+{
+ set_vram(gpu.vram);
PSXDisplay.RGB24 = FALSE; // init some stuff
PSXDisplay.Interlaced = FALSE;
PSXDisplay.RGB24 = FALSE; // init some stuff
PSXDisplay.Interlaced = FALSE;
@@
-312,7
+315,7
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
for (; list < list_end; list += 1 + len)
{
for (; list < list_end; list += 1 + len)
{
- cmd =
*list
>> 24;
+ cmd =
GETLE32(list)
>> 24;
len = cmd_lengths[cmd];
if (list + 1 + len > list_end) {
cmd = -1;
len = cmd_lengths[cmd];
if (list + 1 + len > list_end) {
cmd = -1;
@@
-323,7
+326,7
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
if (cmd == 0xa0 || cmd == 0xc0)
break; // image i/o, forward to upper layer
else if ((cmd & 0xf8) == 0xe0)
if (cmd == 0xa0 || cmd == 0xc0)
break; // image i/o, forward to upper layer
else if ((cmd & 0xf8) == 0xe0)
- gpu.ex_regs[cmd & 7] =
list[0]
;
+ gpu.ex_regs[cmd & 7] =
GETLE32(list)
;
#endif
primTableJ[cmd]((void *)list);
#endif
primTableJ[cmd]((void *)list);
@@
-337,7
+340,12
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
while(1)
{
while(1)
{
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+
+ if((*list_position & HOST2LE32(0xf000f000)) == HOST2LE32(0x50005000))
break;
list_position++;
break;
list_position++;
@@
-355,7
+363,12
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
while(1)
{
while(1)
{
- if((*list_position & 0xf000f000) == 0x50005000 || list_position >= list_end)
+ if(list_position >= list_end) {
+ cmd = -1;
+ goto breakloop;
+ }
+
+ if((*list_position & HOST2LE32(0xf000f000)) == HOST2LE32(0x50005000))
break;
list_position += 2;
break;
list_position += 2;
@@
-370,8
+383,8
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
case 0xA0: // sys -> vid
{
short *slist = (void *)list;
case 0xA0: // sys -> vid
{
short *slist = (void *)list;
- u32 load_width =
slist[4]
;
- u32 load_height =
slist[5]
;
+ u32 load_width =
LE2HOST32(slist[4])
;
+ u32 load_height =
LE2HOST32(slist[5])
;
u32 load_size = load_width * load_height;
len += load_size / 2;
u32 load_size = load_width * load_height;
len += load_size / 2;
@@
-381,6
+394,7
@@
int do_cmd_list(unsigned int *list, int list_len, int *last_cmd)
}
}
}
}
+breakloop:
gpu.ex_regs[1] &= ~0x1ff;
gpu.ex_regs[1] |= lGPUstatusRet & 0x1ff;
gpu.ex_regs[1] &= ~0x1ff;
gpu.ex_regs[1] |= lGPUstatusRet & 0x1ff;
@@
-416,4
+430,7
@@
void renderer_set_config(const struct rearmed_cbs *cbs)
{
iUseDither = cbs->gpu_peops.iUseDither;
dwActFixes = cbs->gpu_peops.dwActFixes;
{
iUseDither = cbs->gpu_peops.iUseDither;
dwActFixes = cbs->gpu_peops.dwActFixes;
+ if (cbs->pl_set_gpu_caps)
+ cbs->pl_set_gpu_caps(0);
+ set_vram(gpu.vram);
}
}