From f0c7d92fb5f8cebbc89558a1689f893fd8f9961e Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 20 Feb 2007 22:28:52 +0000 Subject: [PATCH] Revert glSwapInterval since it does not actually do what I thought it did. Re-enable nVidia hack. --- stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp index f68c9e6fea..a0472399cd 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp @@ -27,7 +27,6 @@ using namespace X11Helper; static GLXContext g_pContext = NULL; static GLXContext g_pBackgroundContext = NULL; static Window g_AltWindow = None; -static PWSWAPINTERVALEXTPROC glSwapInterval = NULL; static LocalizedString FAILED_CONNECTION_XSERVER( "LowLevelWindow_X11", "Failed to establish a connection with the X server" ); LowLevelWindow_X11::LowLevelWindow_X11() @@ -51,7 +50,6 @@ LowLevelWindow_X11::LowLevelWindow_X11() LOG->Info( "Client GLX vendor: %s [%s]", glXGetClientString( Dpy, GLX_VENDOR ), glXGetClientString( Dpy, GLX_VERSION ) ); m_bWasWindowed = true; - glSwapInterval = (PWSWAPINTERVALEXTPROC)GetProcAddress( "glXSwapIntervalSGI" ); } LowLevelWindow_X11::~LowLevelWindow_X11() @@ -92,7 +90,7 @@ void *LowLevelWindow_X11::GetProcAddress( RString s ) RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDeviceOut ) { -#if defined(LINUX) && 0 +#if defined(LINUX) /* * nVidia cards: * @@ -248,8 +246,6 @@ RString LowLevelWindow_X11::TryVideoMode( const VideoModeParams &p, bool &bNewDe // Do this even if we just created the window -- works around Ion2 not // catching WM normal hints changes in mapped windows. XResizeWindow( Dpy, Win, p.width, p.height ); - if( glSwapInterval ) - glSwapInterval( p.vsync ); CurrentParams = p; CurrentParams.rate = rate;