Revert glSwapInterval since it does not actually do what I thought it did. Re-enable nVidia hack.

This commit is contained in:
Steve Checkoway
2007-02-20 22:28:52 +00:00
parent 9428c1c852
commit f0c7d92fb5
@@ -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;