From 6654fa2e1d53b928a32715af5e20b1ad48c246ce Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 29 Jul 2008 09:26:41 +0000 Subject: [PATCH] Mac OS X does not need glFlush() called, swapping the buffers does it implicitly. --- stepmania/src/RageDisplay_OGL.cpp | 4 ++++ stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm | 1 - stepmania/src/archutils/Darwin/arch_setup.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index a2c0b02a84..5c8955315e 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -27,6 +27,10 @@ using namespace RageDisplay_OGL_Helpers; #pragma comment(lib, "glu32.lib") #endif +#ifdef NO_GL_FLUSH +#define glFlush() +#endif + // // Globals // diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm index 05ee94c4d3..615f95743c 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm @@ -271,7 +271,6 @@ void RenderTarget_MacOSX::StartRenderingTo() void RenderTarget_MacOSX::FinishRenderingTo() { DEBUG_ASSERT( m_OldContext ); - glFlush(); glBindTexture( GL_TEXTURE_2D, m_iTexHandle ); while( glGetError() != GL_NO_ERROR ) diff --git a/stepmania/src/archutils/Darwin/arch_setup.h b/stepmania/src/archutils/Darwin/arch_setup.h index bd90dded01..f7d5c78d27 100644 --- a/stepmania/src/archutils/Darwin/arch_setup.h +++ b/stepmania/src/archutils/Darwin/arch_setup.h @@ -23,6 +23,8 @@ extern "C" int SM_main( int argc, char *argv[] ); #define CRASH_HANDLER #define GL_GET_ERROR_IS_SLOW +// CGFlushDrawable() performs a glFlush() and the docs say not to call glFlush() +#define NO_GL_FLUSH #if defined(__ppc__) # define CPU_PPC