The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-24 11:39:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove callback, correct use of DrawDone

Browse Source
This commit is contained in:
dborth 2009-10-12 19:18:49 +00:00
parent ae44af0dac
commit a958264785
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/ngc/FreeTypeGX.cpp
View File

@ -678,7 +678,6 @@ void FreeTypeGX::copyTextureToFramebuffer(GXTexObj *texObj, f32 texWidth, f32 te
GX_Color4u8(color.r, color.g, color.b, color.a); GX_Color4u8(color.r, color.g, color.b, color.a);
GX_TexCoord2f32(0.0f, 1.0f); GX_TexCoord2f32(0.0f, 1.0f);
GX_End(); GX_End();
GX_DrawDone();
this->setDefaultMode(); this->setDefaultMode();
} }
@ -712,7 +711,6 @@ void FreeTypeGX::copyFeatureToFramebuffer(f32 featureWidth, f32 featureHeight, i
GX_Position2s16(screenX, featureHeight + screenY); GX_Position2s16(screenX, featureHeight + screenY);
GX_Color4u8(color.r, color.g, color.b, color.a); GX_Color4u8(color.r, color.g, color.b, color.a);
GX_End(); GX_End();
GX_DrawDone();
this->setDefaultMode(); this->setDefaultMode();
} }

3
source/ngc/menu.cpp
View File

@ -270,6 +270,7 @@ UpdateGUI (void *arg)
if(guiHalt) if(guiHalt)
LWP_SuspendThread(guithread); LWP_SuspendThread(guithread);
UpdatePads();
mainWindow->Draw(); mainWindow->Draw();
#ifdef HW_RVL #ifdef HW_RVL
@ -842,6 +843,8 @@ static void WindowCredits(void * ptr)
while(!exit) while(!exit)
{ {
UpdatePads();
if(gameScreenImg) if(gameScreenImg)
gameScreenImg->Draw(); gameScreenImg->Draw();
else else

8
source/ngc/video.cpp
View File

@ -286,9 +286,7 @@ vbgetback (void *arg)
VIDEO_WaitVSync (); /**< Wait for video vertical blank */ VIDEO_WaitVSync (); /**< Wait for video vertical blank */
LWP_SuspendThread (vbthread); LWP_SuspendThread (vbthread);
} }
return NULL; return NULL;
} }
/**************************************************************************** /****************************************************************************
@ -629,7 +627,6 @@ ResetVideo_Emu ()
} }
SetupVideoMode(rmode); // reconfigure VI SetupVideoMode(rmode); // reconfigure VI
VIDEO_SetPreRetraceCallback(NULL);
GXColor background = {0, 0, 0, 255}; GXColor background = {0, 0, 0, 255};
GX_SetCopyClear (background, 0x00ffffff); GX_SetCopyClear (background, 0x00ffffff);
@ -713,7 +710,6 @@ int fscale;
void void
update_video (int width, int height) update_video (int width, int height)
{ {
vwidth = width; vwidth = width;
vheight = height; vheight = height;
@ -936,7 +932,6 @@ ResetVideo_Menu ()
GXRModeObj * rmode = FindVideoMode(); GXRModeObj * rmode = FindVideoMode();
SetupVideoMode(rmode); // reconfigure VI SetupVideoMode(rmode); // reconfigure VI
VIDEO_SetPreRetraceCallback((VIRetraceCallback)UpdatePads);
// clears the bg to color and clears the z buffer // clears the bg to color and clears the z buffer
GXColor background = {0, 0, 0, 255}; GXColor background = {0, 0, 0, 255};
@ -999,6 +994,7 @@ void Menu_Render()
GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); GX_SetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
GX_SetColorUpdate(GX_TRUE); GX_SetColorUpdate(GX_TRUE);
GX_CopyDisp(xfb[whichfb],GX_TRUE); GX_CopyDisp(xfb[whichfb],GX_TRUE);
GX_DrawDone();
VIDEO_SetNextFramebuffer(xfb[whichfb]); VIDEO_SetNextFramebuffer(xfb[whichfb]);
VIDEO_Flush(); VIDEO_Flush();
VIDEO_WaitVSync(); VIDEO_WaitVSync();
@ -1054,7 +1050,6 @@ void Menu_DrawImg(f32 xpos, f32 ypos, u16 width, u16 height, u8 data[],
GX_Color4u8(0xFF,0xFF,0xFF,alpha); GX_Color4u8(0xFF,0xFF,0xFF,alpha);
GX_TexCoord2f32(0, 1); GX_TexCoord2f32(0, 1);
GX_End(); GX_End();
GX_DrawDone();
GX_LoadPosMtxImm (GXmodelView2D, GX_PNMTX0); GX_LoadPosMtxImm (GXmodelView2D, GX_PNMTX0);
GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR); GX_SetTevOp (GX_TEVSTAGE0, GX_PASSCLR);
@ -1093,5 +1088,4 @@ void Menu_DrawRectangle(f32 x, f32 y, f32 width, f32 height, GXColor color, u8 f
GX_Color4u8(color.r, color.g, color.b, color.a); GX_Color4u8(color.r, color.g, color.b, color.a);
} }
GX_End(); GX_End();
GX_DrawDone();
} }