Merge branch 'fgsfdsfgs:port' into port

This commit is contained in:
Catherine Reprobate authored and GitHub committed 2023-08-18 16:39:44 -07:00
commit a71c7cbba2
13 files changed
+245 -20

No files matched your search

+4
View File
@@ -86,7 +86,11 @@ extern Mtx *var8009cc80;
extern Mtx *var8009cc84;
extern Mtx *var8009cc88;
extern u8 *var8009cca0;
#ifdef PLATFORM_N64
extern void *var8009ccc0[20];
#else
extern int var8009ccc0[20];
#endif
extern s32 g_NumChrs;
extern s16 *g_Chrnums;
extern s16 *g_ChrIndexes;
+36
View File
@@ -180,4 +180,40 @@
#define G_CC_CUSTOM_26 TEXEL1, TEXEL0, LOD_FRACTION, TEXEL0, TEXEL0, 0, ENVIRONMENT, 0
#define G_CC_CUSTOM_27 PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT
#ifndef PLATFORM_N64
/* Extended RDP commands */
#define G_SETFB_EXT 0x21
#define G_COPYFB_EXT 0x41
#define G_SETTIMG_FB_EXT 0x23
#define G_INVALTEXCACHE_EXT 0x34
/* Extended RDP command macros */
#define gDPSetFramebufferTargetEXT(pkt, f, s, w, i) \
gSetImage(pkt, G_SETFB_EXT, f, s, w, i)
#define gDPSetFramebufferTextureEXT(pkt, f, s, w, i) \
gSetImage(pkt, G_SETTIMG_FB_EXT, f, s, w, i)
#define gDPCopyFramebufferEXT(pkt, dst, src, uls, ult) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = _SHIFTL(G_COPYFB_EXT, 24, 8) \
| _SHIFTL(dst, 12, 12) | _SHIFTL(src, 0, 12); \
_g->words.w1 = _SHIFTL(uls, 16, 16) | _SHIFTL(ult, 0, 16); \
}
#define gDPInvalTexCacheEXT(pkt, addr) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = _SHIFTL(G_INVALTEXCACHE_EXT, 24, 8) \
_g->words.w1 = (uintptr_t)(addr); \
}
#endif
#endif