Toyed with gl init ordering. Fixes adaptive vsync. May explode on linux, not that adaptive vsync works there, but it should in theory work there if we ever port to sdl2. If it does explode, I'll know shortly... probably.

2014-05-14 03:10:34 -05:00
parent 117eca3c98
commit 22bcf83cb9
3 changed files with 6 additions and 20 deletions
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1641,10 +1641,6 @@ LLViewerWindow::LLViewerWindow(
 	resetSnapshotLoc();

 	S32 vsync_mode = gSavedSettings.getS32("SHRenderVsyncMode");
-	if(vsync_mode == -1 && !gGLManager.mHasAdaptiveVsync)
-	{
-		vsync_mode = 0; //Disable vsync if adaptive is desired yet isn't supported.
-	}

 	// create window
 	mWindow = LLWindowManager::createWindow(this,