The GRRLIB code should now be able to compile for GameCube.

This commit is contained in:
Crayon2000 2015-09-25 21:20:05 -04:00
parent 080dd9b7fd
commit f1a3e81770
2 changed files with 14 additions and 4 deletions

View file

@ -72,7 +72,8 @@ int GRRLIB_Init (void) {
break; break;
} }
// 16:9 and 4:3 Screen Adjustment #if defined(HW_RVL)
// 16:9 and 4:3 Screen Adjustment for Wii
if (CONF_GetAspectRatio() == CONF_ASPECT_16_9) { if (CONF_GetAspectRatio() == CONF_ASPECT_16_9) {
rmode->viWidth = 678; rmode->viWidth = 678;
rmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 678)/2; // This probably needs to consider PAL rmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 678)/2; // This probably needs to consider PAL
@ -80,6 +81,11 @@ int GRRLIB_Init (void) {
rmode->viWidth = 672; rmode->viWidth = 672;
rmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 672)/2; rmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 672)/2;
} }
#else
// GameCube
rmode->viWidth = 672;
rmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 672)/2;
#endif
// -- // --
VIDEO_Configure(rmode); VIDEO_Configure(rmode);
@ -181,8 +187,12 @@ int GRRLIB_Init (void) {
*/ */
void GRRLIB_Exit (void) { void GRRLIB_Exit (void) {
static bool done = false; static bool done = false;
if (done || !is_setup) return; if (done || !is_setup) {
else done = true; return;
}
else {
done = true;
}
// Allow write access to the full screen // Allow write access to the full screen
GX_SetClipMode( GX_CLIP_DISABLE ); GX_SetClipMode( GX_CLIP_DISABLE );

View file

@ -60,6 +60,6 @@ void GRRLIB_FreeTexture (GRRLIB_texImg *tex) {
*/ */
INLINE INLINE
void GRRLIB_ClearTex(GRRLIB_texImg* tex) { void GRRLIB_ClearTex(GRRLIB_texImg* tex) {
bzero(tex->data, (tex->h * tex->w) << 2); memset(tex->data, 0, (tex->h * tex->w) << 2);
GRRLIB_FlushTex(tex); GRRLIB_FlushTex(tex);
} }