mirror of
https://github.com/dborth/snes9xgx.git
synced 2024-11-30 14:34:22 +01:00
This commit is contained in:
parent
edee4227ce
commit
263e039b57
@ -19,8 +19,10 @@
|
|||||||
struct sGui Gui;
|
struct sGui Gui;
|
||||||
|
|
||||||
GXTexObj texobj_BG, texobj_MENU;
|
GXTexObj texobj_BG, texobj_MENU;
|
||||||
u8 texdata_bg[640 * 480 * 4] ATTRIBUTE_ALIGN (32); // stores the blended menu backdrop
|
void * texdata_bg; // stores the blended menu backdrop
|
||||||
u8 texdata_menu[640 * 480 * 4] ATTRIBUTE_ALIGN (32); // stores the menu overlay
|
void * texdata_menu; // stores the menu overlay
|
||||||
|
|
||||||
|
bool mem_alloced = 0;
|
||||||
|
|
||||||
extern GXTexObj texobj;
|
extern GXTexObj texobj;
|
||||||
extern int vwidth, vheight;
|
extern int vwidth, vheight;
|
||||||
@ -76,6 +78,32 @@ gui_alphasetup ()
|
|||||||
GX_SetAlphaUpdate(GX_ENABLE);
|
GX_SetAlphaUpdate(GX_ENABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
gui_alloc ()
|
||||||
|
{
|
||||||
|
if (!mem_alloced)
|
||||||
|
{
|
||||||
|
texdata_bg = memalign (32, 640 * 480 * 4);
|
||||||
|
texdata_menu = memalign (32, 640 * 480 * 4);
|
||||||
|
Gui.texmem = memalign (32, 640 * 480 * 4);
|
||||||
|
|
||||||
|
mem_alloced = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
gui_free ()
|
||||||
|
{
|
||||||
|
if (mem_alloced)
|
||||||
|
{
|
||||||
|
free (texdata_bg);
|
||||||
|
free (texdata_menu);
|
||||||
|
free (Gui.texmem);
|
||||||
|
|
||||||
|
mem_alloced = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* make BG
|
* make BG
|
||||||
*
|
*
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
|
|
||||||
struct sGui {
|
struct sGui {
|
||||||
u8 texmem[640 * 480 * 4] ATTRIBUTE_ALIGN (32); // rgba8 - working draw area
|
void * texmem; // rgba8 - working draw area
|
||||||
int currmenu;
|
int currmenu;
|
||||||
int prevmenu;
|
int prevmenu;
|
||||||
u32 fontcolour;
|
u32 fontcolour;
|
||||||
|
@ -293,6 +293,7 @@ emulate ()
|
|||||||
|
|
||||||
// GUI Stuff
|
// GUI Stuff
|
||||||
/*
|
/*
|
||||||
|
gui_alloc();
|
||||||
gui_makebg ();
|
gui_makebg ();
|
||||||
gui_clearscreen();
|
gui_clearscreen();
|
||||||
gui_draw ();
|
gui_draw ();
|
||||||
|
@ -587,6 +587,7 @@ ResetVideo_Emu ()
|
|||||||
int i;
|
int i;
|
||||||
for (i=0; i<4; i++) {
|
for (i=0; i<4; i++) {
|
||||||
if (tvmodes[i]->efbHeight == vheight) {
|
if (tvmodes[i]->efbHeight == vheight) {
|
||||||
|
// FIX: fix this fix ...
|
||||||
tvmodes[i]->fbWidth = vwidth; // update width - some games are 512x224 (super pang)
|
tvmodes[i]->fbWidth = vwidth; // update width - some games are 512x224 (super pang)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -622,14 +623,15 @@ ResetVideo_Emu ()
|
|||||||
GX_LoadProjectionMtx (p, GX_ORTHOGRAPHIC);
|
GX_LoadProjectionMtx (p, GX_ORTHOGRAPHIC);
|
||||||
|
|
||||||
// clear snes9x render screen
|
// clear snes9x render screen
|
||||||
memset (snes9xgfx, 0, 1024 * 512 * 2);
|
//memset (snes9xgfx, 0, 1024 * 512 * 2);
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
// DEBUG
|
// DEBUG
|
||||||
char* msg = (char*) malloc(256*sizeof(char));
|
char* msg = (char*) malloc(256*sizeof(char));
|
||||||
sprintf (msg, (char*)"Interlaced: %i, vwidth: %d, vheight: %d, fb_W: %u, efb_H: %u", IPPU.Interlace, vwidth, vheight, rmode->fbWidth, rmode->efbHeight);
|
sprintf (msg, (char*)"Interlaced: %i, vwidth: %d, vheight: %d, fb_W: %u, efb_H: %u", IPPU.Interlace, vwidth, vheight, rmode->fbWidth, rmode->efbHeight);
|
||||||
S9xMessage (0, 0, msg);
|
S9xMessage (0, 0, msg);
|
||||||
free(msg);
|
free(msg);
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -738,9 +740,10 @@ update_video (int width, int height)
|
|||||||
|
|
||||||
whichfb ^= 1;
|
whichfb ^= 1;
|
||||||
|
|
||||||
if ((oldvheight != vheight) || (oldvwidth != vwidth) // if rendered width/height changes
|
if ( oldvheight != vheight || oldvwidth != vwidth ) // if rendered width/height changes, update scaling
|
||||||
|| (CheckVideo && (IPPU.RenderedFramesCount != prevRenderedFrameCount)) // or if we get back from the menu, and have rendered at least 1 frame
|
CheckVideo = 1;
|
||||||
)
|
|
||||||
|
if ( CheckVideo && (IPPU.RenderedFramesCount != prevRenderedFrameCount) ) // if we get back from the menu, and have rendered at least 1 frame
|
||||||
{
|
{
|
||||||
int xscale, yscale, xshift, yshift;
|
int xscale, yscale, xshift, yshift;
|
||||||
yshift = xshift = 0;
|
yshift = xshift = 0;
|
||||||
@ -779,15 +782,13 @@ update_video (int width, int height)
|
|||||||
if (!GCSettings.render)
|
if (!GCSettings.render)
|
||||||
GX_InitTexObjLOD(&texobj,GX_NEAR,GX_NEAR_MIP_NEAR,2.5,9.0,0.0,GX_FALSE,GX_FALSE,GX_ANISO_1);
|
GX_InitTexObjLOD(&texobj,GX_NEAR,GX_NEAR_MIP_NEAR,2.5,9.0,0.0,GX_FALSE,GX_FALSE,GX_ANISO_1);
|
||||||
|
|
||||||
/*
|
|
||||||
// DEBUG
|
// DEBUG
|
||||||
char* msg = (char*) malloc(256*sizeof(char));
|
char* msg = (char*) malloc(256*sizeof(char));
|
||||||
sprintf (msg, (char*)"xscale: %d, yscale: %d", xscale, yscale);
|
sprintf (msg, (char*)"xscale: %d, yscale: %d", xscale, yscale);
|
||||||
S9xMessage (0, 0, msg);
|
S9xMessage (0, 0, msg);
|
||||||
free(msg);
|
free(msg);
|
||||||
*/
|
|
||||||
|
|
||||||
//GX_SetViewport (0, 0, rmode->fbWidth, rmode->efbHeight, 0, 1);
|
|
||||||
|
|
||||||
oldvwidth = vwidth;
|
oldvwidth = vwidth;
|
||||||
oldvheight = vheight;
|
oldvheight = vheight;
|
||||||
|
Loading…
Reference in New Issue
Block a user