Fixed EFB copying when when FPS > VI/s.

extremscorner · May 28, 2010 · 2765ee3 · 2765ee3
1 parent 67ae68a
commit 2765ee3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/glN64_GX/VI.cpp b/glN64_GX/VI.cpp
@@ -173,22 +173,25 @@ void VI_UpdateScreen()
 	}
 	else
 	{
-		if (gSP.changed & CHANGED_COLORBUFFER)
+/*		if (gSP.changed & CHANGED_COLORBUFFER)
+		{
 			OGL_SwapBuffers();
-
-		VI_GX_cleanUp();
-		if(VI.updateOSD && gDP.colorImage.changed)
+			gSP.changed &= ~CHANGED_COLORBUFFER;
+		}*/
+		if(VI.updateOSD && (gSP.changed & CHANGED_COLORBUFFER))
 		{
+			VI_GX_cleanUp();
 			VI_GX_showStats();
 			VI_GX_showFPS();
 			VI_GX_showDEBUG();
 			GX_SetCopyClear ((GXColor){0,0,0,255}, 0xFFFFFF);
-			GX_CopyDisp (VI.xfb[VI.which_fb]+GX_xfb_offset, GX_FALSE);
+//			GX_CopyDisp (VI.xfb[VI.which_fb]+GX_xfb_offset, GX_FALSE);
+			GX_CopyDisp (VI.xfb[VI.which_fb]+GX_xfb_offset, GX_TRUE);
 			GX_DrawDone(); //Wait until EFB->XFB copy is complete
 			VI.updateOSD = false;
-			gDP.colorImage.changed = FALSE;
 			VI.EFBcleared = false;
 			VI.copy_fb = true;
+			gSP.changed &= ~CHANGED_COLORBUFFER;
 		}
 	}
 #endif // __GX__

diff --git a/glN64_GX/glN64.cpp b/glN64_GX/glN64.cpp
@@ -324,9 +324,9 @@ EXPORT void CALL ProcessDList(void)
 	sprintf(txtbuffer,"\nPROCESS D LIST!!\n\n");
 	DEBUG_print(txtbuffer,DBG_SDGECKOPRINT);
 #endif // GLN64_SDLOG
-	float color[4] = {0.0f,0.0f,0.0f,0.0f};
-	OGL_ClearColorBuffer( color );
-	OGL_ClearDepthBuffer();
+//	float color[4] = {0.0f,0.0f,0.0f,0.0f};
+//	OGL_ClearColorBuffer( color );
+//	OGL_ClearDepthBuffer();
 //	OGL_GXclearEFB();
 //	VI_GX_clearEFB();
 #endif // __GX__