mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(NGC) Build fix

Browse Source
This commit is contained in:
twinaphex 2014-02-21 02:38:15 +01:00
parent b34b08c2a6
commit 78126ec224
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.griffin
View File

@ -63,6 +63,8 @@ endif
HAVE_THREADS := 1
HAVE_ZLIB := 1
HAVE_RPNG := 1
HAVE_OVERLAY := 1
else ifeq ($(platform), wii)
CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)

1
gx/gx_video.c
View File

@ -32,6 +32,7 @@
#include <stdlib.h>
#include <string.h>
#include "ppc_asm.h"
#include "gx_video_inl.h"
#define SYSMEM1_SIZE 0x01800000

23
gx/gx_video_inl.h
View File

@ -29,6 +29,9 @@
FIFO_PUTU8(0x10); \
FIFO_PUTU32((((((n)&0xffff)-1)<<16)|((x)&0xffff)))
#define _SHIFTL(v, s, w) ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
#define _SHIFTR(v, s, w) ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
extern u8 __gxregs[];
struct __gx_regdef
@ -353,23 +356,21 @@ static inline void __GX_UpdateBPMask(struct __gx_regdef *__gx)
u32 i;
u32 nbmp,nres;
u8 ntexmap;
nbmp = _SHIFTR(_gx[0xac],16,3);
nbmp = _SHIFTR(__gx->genMode,16,3);
nres = 0;
for(i=0;i<nbmp;i++) {
switch(i) {
case GX_INDTEXSTAGE0:
ntexmap = _gx[0xc2]&7;
ntexmap = __gx->tevRasOrder[2]&7;
break;
case GX_INDTEXSTAGE1:
ntexmap = _SHIFTR(_gx[0xc2],6,3);
ntexmap = _SHIFTR(__gx->tevRasOrder[2],6,3);
break;
case GX_INDTEXSTAGE2:
ntexmap = _SHIFTR(_gx[0xc2],12,3);
ntexmap = _SHIFTR(__gx->tevRasOrder[2],12,3);
break;
case GX_INDTEXSTAGE3:
ntexmap = _SHIFTR(_gx[0xc2],18,3);
ntexmap = _SHIFTR(__gx->tevRasOrder[2],18,3);
break;
default:
ntexmap = 0;
@ -377,11 +378,9 @@ static inline void __GX_UpdateBPMask(struct __gx_regdef *__gx)
}
nres |= (1<<ntexmap);
}
if((_gx[0xaf]&0xff)!=nres)
{
_gx[0xaf] = (_gx[0xaf]&~0xff)|(nres&0xff);
GX_LOAD_BP_REG(_gx[0xaf]);
if((__gx->tevIndMask&0xff)!=nres) {
__gx->tevIndMask = (__gx->tevIndMask&~0xff)|(nres&0xff);
GX_LOAD_BP_REG(__gx->tevIndMask);
}
}
#endif

6
gx/ppc_asm.h
View File

@ -41,8 +41,6 @@
})
#endif
#ifdef GEKKO
#ifndef _CPU_ISR_Enable
#define _CPU_ISR_Enable() \
{ register u32 _val = 0; \
@ -84,10 +82,8 @@
: "0"((_isr_cookie)),"1" ((_enable_mask)) \
); \
}
#endif
extern void __lwp_thread_stopmultitasking(void (*exitfunc)());
#endif
#endif
#endif