The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-22 18:49:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

update video, activate part of PPC core

Browse Source
This commit is contained in:
dborth 2008-10-10 22:33:57 +00:00
parent fb1f522721
commit a8132e05fb
4 changed files with 127 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/ngc/preferences.cpp
View File

@ -248,9 +248,9 @@ decodePrefsData (int method)
char verMinor = version[9]; char verMinor = version[9];
char verPoint = version[11]; char verPoint = version[11];
if(verPoint < '2' && verMajor == '1') // less than version 1.0.2 if(verPoint < '3' && verMajor == '1') // less than version 1.0.3
return false; // reset settings return false; // reset settings
else if(verMajor > '1' || verMinor > '0' || verPoint > '2') // some future version else if(verMajor > '1' || verMinor > '0' || verPoint > '3') // some future version
return false; // reset settings return false; // reset settings
// File Settings // File Settings

198
source/ngc/video.cpp
View File

@ -19,6 +19,7 @@
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "images/bg.h" #include "images/bg.h"
#include "vba.h" #include "vba.h"
#include "menudraw.h"
//#include "pal60.h" //#include "pal60.h"
extern unsigned int SMBTimer; // timer to reset SMB connection extern unsigned int SMBTimer; // timer to reset SMB connection
@ -45,6 +46,7 @@ GXTexObj texobj;
static Mtx view; static Mtx view;
static int vwidth, vheight, oldvwidth, oldvheight; static int vwidth, vheight, oldvwidth, oldvheight;
static int video_vaspect, video_haspect; static int video_vaspect, video_haspect;
int updateScaling;
float zoom_level = 1; float zoom_level = 1;
#define HASPECT 80 #define HASPECT 80
@ -106,7 +108,6 @@ vbgetback (void *arg)
} }
return NULL; return NULL;
} }
/**************************************************************************** /****************************************************************************
@ -136,7 +137,6 @@ InitVideoThread ()
static void static void
copy_to_xfb (u32 arg) copy_to_xfb (u32 arg)
{ {
if (copynow == GX_TRUE) if (copynow == GX_TRUE)
{ {
GX_CopyDisp (xfb[whichfb], GX_TRUE); GX_CopyDisp (xfb[whichfb], GX_TRUE);
@ -174,24 +174,26 @@ showscreen ()
****************************************************************************/ ****************************************************************************/
static void draw_init(void) static void draw_init(void)
{ {
GX_ClearVtxDesc(); GX_ClearVtxDesc ();
GX_SetVtxDesc(GX_VA_POS, GX_INDEX8); GX_SetVtxDesc (GX_VA_POS, GX_INDEX8);
GX_SetVtxDesc(GX_VA_CLR0, GX_INDEX8); GX_SetVtxDesc (GX_VA_CLR0, GX_INDEX8);
GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT); GX_SetVtxDesc (GX_VA_TEX0, GX_DIRECT);
GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); GX_SetVtxAttrFmt (GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); GX_SetVtxAttrFmt (GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
GX_SetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0); GX_SetVtxAttrFmt (GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
GX_SetArray(GX_VA_POS, square, 3 * sizeof(s16)); GX_SetArray (GX_VA_POS, square, 3 * sizeof (s16));
GX_SetNumTexGens(1); GX_SetNumTexGens (1);
GX_SetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY); GX_SetNumChans (0);
GX_SetTexCoordGen (GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
GX_InvalidateTexAll(); GX_InvalidateTexAll();
memset (&view, 0, sizeof (Mtx));
GX_InitTexObj(&texobj, texturemem, vwidth, vheight, GX_TF_RGB565, guLookAt(view, &cam.pos, &cam.up, &cam.view);
GX_CLAMP, GX_CLAMP, GX_FALSE); GX_LoadPosMtxImm (view, GX_PNMTX0);
} }
static void draw_vert(u8 pos, u8 c, f32 s, f32 t) static void draw_vert(u8 pos, u8 c, f32 s, f32 t)
@ -226,28 +228,31 @@ void GX_Start()
{ {
Mtx p; Mtx p;
GXColor gxbackground = { 0, 0, 0, 0xff }; GXColor background = { 0, 0, 0, 0xff };
/*** Clear out FIFO area ***/ /*** Clear out FIFO area ***/
memset(&gp_fifo, 0, DEFAULT_FIFO_SIZE); memset (&gp_fifo, 0, DEFAULT_FIFO_SIZE);
/*** Initialise GX ***/ /*** Initialise GX ***/
GX_Init(&gp_fifo, DEFAULT_FIFO_SIZE); GX_Init (&gp_fifo, DEFAULT_FIFO_SIZE);
GX_SetCopyClear(gxbackground, 0x00ffffff); GX_SetCopyClear (background, 0x00ffffff);
GX_SetViewport(0, 0, vmode->fbWidth, vmode->efbHeight, 0, 1);
GX_SetDispCopyYScale((f32) vmode->xfbHeight / (f32) vmode->efbHeight); GX_SetViewport (0, 0, vmode->fbWidth, vmode->efbHeight, 0, 1);
GX_SetScissor(0, 0, vmode->fbWidth, vmode->efbHeight); GX_SetDispCopyYScale ((f32) vmode->xfbHeight / (f32) vmode->efbHeight);
GX_SetDispCopySrc(0, 0, vmode->fbWidth, vmode->efbHeight); GX_SetScissor (0, 0, vmode->fbWidth, vmode->efbHeight);
GX_SetDispCopyDst(vmode->fbWidth, vmode->xfbHeight);
GX_SetCopyFilter(vmode->aa, vmode->sample_pattern, GX_TRUE, vmode->vfilter); GX_SetDispCopySrc (0, 0, vmode->fbWidth, vmode->efbHeight);
GX_SetFieldMode(vmode->field_rendering, GX_SetDispCopyDst (vmode->fbWidth, vmode->xfbHeight);
((vmode->viHeight == GX_SetCopyFilter (vmode->aa, vmode->sample_pattern, GX_TRUE, vmode->vfilter);
2 * vmode->xfbHeight) ? GX_ENABLE : GX_DISABLE));
GX_SetPixelFmt(GX_PF_RGB8_Z24, GX_ZC_LINEAR); GX_SetFieldMode (vmode->field_rendering, ((vmode->viHeight == 2 * vmode->xfbHeight) ? GX_ENABLE : GX_DISABLE));
GX_SetCullMode(GX_CULL_NONE);
GX_CopyDisp(xfb[whichfb ^ 1], GX_TRUE); GX_SetPixelFmt (GX_PF_RGB8_Z24, GX_ZC_LINEAR);
GX_SetDispCopyGamma(GX_GM_1_0); GX_SetCullMode (GX_CULL_NONE);
GX_SetDispCopyGamma (GX_GM_1_0);
GX_SetZMode (GX_TRUE, GX_LEQUAL, GX_TRUE);
GX_SetColorUpdate (GX_TRUE);
guPerspective(p, 60, 1.33F, 10.0F, 1000.0F); guPerspective(p, 60, 1.33F, 10.0F, 1000.0F);
GX_LoadProjectionMtx(p, GX_PERSPECTIVE); GX_LoadProjectionMtx(p, GX_PERSPECTIVE);
@ -255,8 +260,10 @@ void GX_Start()
GX_SetTevOp(GX_TEVSTAGE0, GX_DECAL); GX_SetTevOp(GX_TEVSTAGE0, GX_DECAL);
GX_SetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); GX_SetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0);
GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); //guOrtho(p, vmode->efbHeight/2, -(vmode->efbHeight/2), -(vmode->fbWidth/2), vmode->fbWidth/2, 10, 1000); // matrix, t, b, l, r, n, f
GX_SetColorUpdate(GX_TRUE); //GX_LoadProjectionMtx (p, GX_ORTHOGRAPHIC);
GX_CopyDisp (xfb[whichfb], GX_TRUE); // reset xfb
} }
/**************************************************************************** /****************************************************************************
@ -285,6 +292,15 @@ void InitialiseVideo ()
VIDEO_Init(); VIDEO_Init();
vmode = VIDEO_GetPreferredMode(NULL); vmode = VIDEO_GetPreferredMode(NULL);
#ifdef HW_DOL
/* we have component cables, but the preferred mode is interlaced
* why don't we switch into progressive?
* on the Wii, the user can do this themselves on their Wii Settings */
if(VIDEO_HaveComponentCable() && vmode == &TVNtsc480IntDf)
vmode = &TVNtsc480Prog;
#endif
VIDEO_Configure(vmode); VIDEO_Configure(vmode);
screenheight = vmode->xfbHeight; screenheight = vmode->xfbHeight;
@ -317,31 +333,12 @@ void InitialiseVideo ()
copynow = GX_FALSE; copynow = GX_FALSE;
GX_Start(); GX_Start();
draw_init();
#ifdef VIDEO_THREADING #ifdef VIDEO_THREADING
InitVideoThread (); InitVideoThread ();
#endif #endif
} }
void GX_Render_Init(int width, int height, int haspect, int vaspect)
{
/*** Allocate 32byte aligned texture memory ***/
texturesize = (width * height) * 2;
if (texturemem)
free(texturemem);
texturemem = (u8 *) memalign(32, texturesize);
memset(texturemem, 0, texturesize);
/*** Setup for first call to scaler ***/
vwidth = vheight = oldvwidth = oldvheight = -1;
video_vaspect = vaspect;
video_haspect = haspect;
}
/**************************************************************************** /****************************************************************************
* ResetVideo_Emu * ResetVideo_Emu
* *
@ -372,9 +369,9 @@ ResetVideo_Emu ()
GX_SetFieldMode (rmode->field_rendering, ((rmode->viHeight == 2 * rmode->xfbHeight) ? GX_ENABLE : GX_DISABLE)); GX_SetFieldMode (rmode->field_rendering, ((rmode->viHeight == 2 * rmode->xfbHeight) ? GX_ENABLE : GX_DISABLE));
GX_SetPixelFmt (GX_PF_RGB8_Z24, GX_ZC_LINEAR); GX_SetPixelFmt (GX_PF_RGB8_Z24, GX_ZC_LINEAR);
/*
guOrtho(p, rmode->efbHeight/2, -(rmode->efbHeight/2), -(rmode->fbWidth/2), rmode->fbWidth/2, 10, 1000); // matrix, t, b, l, r, n, f //guOrtho(p, rmode->efbHeight/2, -(rmode->efbHeight/2), -(rmode->fbWidth/2), rmode->fbWidth/2, 10, 1000); // matrix, t, b, l, r, n, f
GX_LoadProjectionMtx (p, GX_ORTHOGRAPHIC);*/ //GX_LoadProjectionMtx (p, GX_ORTHOGRAPHIC);
} }
/**************************************************************************** /****************************************************************************
@ -404,9 +401,61 @@ ResetVideo_Menu ()
GX_SetFieldMode (vmode->field_rendering, ((vmode->viHeight == 2 * vmode->xfbHeight) ? GX_ENABLE : GX_DISABLE)); GX_SetFieldMode (vmode->field_rendering, ((vmode->viHeight == 2 * vmode->xfbHeight) ? GX_ENABLE : GX_DISABLE));
GX_SetPixelFmt (GX_PF_RGB8_Z24, GX_ZC_LINEAR); GX_SetPixelFmt (GX_PF_RGB8_Z24, GX_ZC_LINEAR);
/*
guOrtho(p, vmode->efbHeight/2, -(vmode->efbHeight/2), -(vmode->fbWidth/2), vmode->fbWidth/2, 10, 1000); // matrix, t, b, l, r, n, f //guOrtho(p, vmode->efbHeight/2, -(vmode->efbHeight/2), -(vmode->fbWidth/2), vmode->fbWidth/2, 10, 1000); // matrix, t, b, l, r, n, f
GX_LoadProjectionMtx (p, GX_ORTHOGRAPHIC);*/ //GX_LoadProjectionMtx (p, GX_ORTHOGRAPHIC);
}
void UpdateScaling()
{
// Update scaling
int xscale = video_haspect;
int yscale = video_vaspect;
// change zoom
xscale *= zoom_level;
yscale *= zoom_level;
// Set new aspect (now with crap AR hack!)
square[0] = square[9] = (-xscale - 7);
square[3] = square[6] = (xscale + 7);
square[1] = square[4] = (yscale + 7);
square[7] = square[10] = (-yscale - 7);
GX_InvVtxCache (); // update vertex cache
GX_InitTexObj (&texobj, texturemem, vwidth, vheight, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE); // initialize the texture obj we are going to use
if (GCSettings.render == 1)
GX_InitTexObjLOD(&texobj,GX_NEAR,GX_NEAR_MIP_NEAR,2.5,9.0,0.0,GX_FALSE,GX_FALSE,GX_ANISO_1); // original/unfiltered video mode: force texture filtering OFF
GX_LoadTexObj (&texobj, GX_TEXMAP0); // load texture object so its ready to use
draw_init();
updateScaling = 0;
}
void GX_Render_Init(int width, int height, int haspect, int vaspect)
{
ResetVideo_Emu (); // reset video to emulator rendering settings
if (texturemem)
free(texturemem);
/*** Allocate 32byte aligned texture memory ***/
texturesize = (width * height) * 2;
texturemem = (u8 *) memalign(32, texturesize);
memset(texturemem, 0, texturesize);
/*** Setup for first call to scaler ***/
vwidth = vheight = oldvwidth = oldvheight = -1;
updateScaling = 1;
video_vaspect = vaspect;
video_haspect = haspect;
UpdateScaling();
} }
/**************************************************************************** /****************************************************************************
@ -486,32 +535,16 @@ void GX_Render(int width, int height, u8 * buffer, int pitch)
whichfb ^= 1; whichfb ^= 1;
if(updateScaling)
{
UpdateScaling();
}
if ((oldvheight != vheight) || (oldvwidth != vwidth)) if ((oldvheight != vheight) || (oldvwidth != vwidth))
{ {
// Update scaling
int xscale = video_haspect;
int yscale = video_vaspect;
ResetVideo_Emu (); // reset video to emulator rendering settings
// change zoom
xscale *= zoom_level;
yscale *= zoom_level;
// Set new aspect (now with crap AR hack!)
square[0] = square[9] = (-xscale - 7);
square[3] = square[6] = (xscale + 7);
square[1] = square[4] = (yscale + 7);
square[7] = square[10] = (-yscale - 7);
GX_InvVtxCache (); // update vertex cache
oldvwidth = vwidth; oldvwidth = vwidth;
oldvheight = vheight; oldvheight = vheight;
draw_init(); updateScaling = 1;
memset(&view, 0, sizeof(Mtx));
guLookAt(view, &cam.pos, &cam.up, &cam.view);
GX_SetViewport(0, 0, vmode->fbWidth, vmode->efbHeight, 0, 1);
} }
//MakeTexture ((char *) buffer, (char *) texturemem, vwidth, vheight); // convert image to texture //MakeTexture ((char *) buffer, (char *) texturemem, vwidth, vheight); // convert image to texture
@ -547,9 +580,6 @@ void GX_Render(int width, int height, u8 * buffer, int pitch)
DCFlushRange(texturemem, texturesize); DCFlushRange(texturemem, texturesize);
GX_InvalidateTexAll (); GX_InvalidateTexAll ();
GX_SetNumChans(1);
GX_LoadTexObj(&texobj, GX_TEXMAP0);
draw_square(view); draw_square(view);
GX_DrawDone(); GX_DrawDone();

13
source/vba/agb/GBA-thumb.cpp
View File

@ -96,7 +96,8 @@ static INSN_REGPARM void thumbBreakpoint(u32 opcode)
#define NEG(i) ((i) >> 31) #define NEG(i) ((i) >> 31)
#define POS(i) ((~(i)) >> 31) #define POS(i) ((~(i)) >> 31)
#ifndef C_CORE #if 1 // Wii port override
//#ifndef C_CORE
#ifdef __GNUC__ #ifdef __GNUC__
#ifdef __POWERPC__ #ifdef __POWERPC__
#define ADD_RD_RS_RN(N) \ #define ADD_RD_RS_RN(N) \
@ -171,7 +172,8 @@ static INSN_REGPARM void thumbBreakpoint(u32 opcode)
C_FLAG = (Flags >> 25) & 1; \ C_FLAG = (Flags >> 25) & 1; \
V_FLAG = (Flags >> 26) & 1; \ V_FLAG = (Flags >> 26) & 1; \
} }
#define ADC_RD_RS \ // Wii port - doesn't compile!
/* #define ADC_RD_RS \
{\ {\
register int Flags; \ register int Flags; \
register int Result; \ register int Result; \
@ -190,7 +192,7 @@ static INSN_REGPARM void thumbBreakpoint(u32 opcode)
N_FLAG = (Flags >> 31) & 1; \ N_FLAG = (Flags >> 31) & 1; \
C_FLAG = (Flags >> 25) & 1; \ C_FLAG = (Flags >> 25) & 1; \
V_FLAG = (Flags >> 26) & 1; \ V_FLAG = (Flags >> 26) & 1; \
} }*/
#define SUB_RD_RS_RN(N) \ #define SUB_RD_RS_RN(N) \
{\ {\
register int Flags; \ register int Flags; \
@ -263,7 +265,8 @@ static INSN_REGPARM void thumbBreakpoint(u32 opcode)
C_FLAG = (Flags >> 25) & 1; \ C_FLAG = (Flags >> 25) & 1; \
V_FLAG = (Flags >> 26) & 1; \ V_FLAG = (Flags >> 26) & 1; \
} }
#define SBC_RD_RS \ // Wii port - doesn't compile for some reason
/* #define SBC_RD_RS \
{\ {\
register int Flags; \ register int Flags; \
register int Result; \ register int Result; \
@ -282,7 +285,7 @@ static INSN_REGPARM void thumbBreakpoint(u32 opcode)
N_FLAG = (Flags >> 31) & 1; \ N_FLAG = (Flags >> 31) & 1; \
C_FLAG = (Flags >> 25) & 1; \ C_FLAG = (Flags >> 25) & 1; \
V_FLAG = (Flags >> 26) & 1; \ V_FLAG = (Flags >> 26) & 1; \
} }*/
#define NEG_RD_RS \ #define NEG_RD_RS \
{\ {\
register int Flags; \ register int Flags; \

6
source/vba/agb/GBA.cpp
View File

@ -3361,7 +3361,7 @@ void CPUReset()
cpuDmaHack = false; cpuDmaHack = false;
lastTime = systemGetClock(); //lastTime = systemGetClock();
SWITicks = 0; SWITicks = 0;
} }
@ -3550,13 +3550,13 @@ void CPULoop(int ticks)
system10Frames(60); system10Frames(60);
} }
if(count == 60) { if(count == 60) {
u32 time = systemGetClock(); /*u32 time = systemGetClock();
if(time != lastTime) { if(time != lastTime) {
u32 t = 100000/(time - lastTime); u32 t = 100000/(time - lastTime);
systemShowSpeed(t); systemShowSpeed(t);
} else } else
systemShowSpeed(0); systemShowSpeed(0);
lastTime = time; lastTime = time;*/
count = 0; count = 0;
} }
u32 joy = 0; u32 joy = 0;