Merge branch 'main' into maint-b

3 files changed, 0 insertions, 34 deletions

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 5bb538f892..aff9334cb6 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -34,8 +34,6 @@
 #include "llinstancetracker.h"
 #include "llsd.h"
 
-#include "../llrender/llglheaders.h"
-
 class LLSplashScreen;
 class LLPreeditor;
 class LLWindowCallbacks;
@@ -245,8 +243,6 @@ protected:
     S32         mMinWindowHeight;
     S32         mRefreshRate;
 
-    GLsync      swapFense;
-
     // Handle a UTF-16 encoding unit received from keyboard.
     // Converting the series of UTF-16 encoding units to UTF-32 data,
     // this method passes the resulting UTF-32 data to mCallback's
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 1b8ab27f23..842a41427e 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -38,7 +38,6 @@
 #include "lldir.h"
 #include "indra_constants.h"
 
-#include "../newview/llviewercontrol.h"
 
 #include <OpenGL/OpenGL.h>
 #include <Carbon/Carbon.h>
@@ -1013,19 +1012,6 @@ BOOL LLWindowMacOSX::setSizeImpl(const LLCoordWindow size)
 void LLWindowMacOSX::swapBuffers()
 {
     CGLFlushDrawable(mContext);
-
-    U32 mode = gSavedSettings.getU32("MPVBufferOptiMode");
-    if (mode == 0)
-    {
-        if(gGLManager.mIsApple) mode = 2;
-        else mode = 1;
-    }
-    if (mode > 2)
-    {
-        glClientWaitSync(swapFense, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
-        glDeleteSync(swapFense);
-        swapFense = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-    }
 }
 
 void LLWindowMacOSX::restoreGLContext()
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 83f5e16977..eb689dc48c 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -38,10 +38,6 @@
 #include "lldir.h"
 #include "llfindlocale.h"
 
-#include "../newview/llviewercontrol.h"
-
-extern LLControlGroup gSavedSettings;
-
 #ifdef LL_GLIB
 #include <glib.h>
 #endif
@@ -1259,18 +1255,6 @@ void LLWindowSDL::swapBuffers()
     if (mWindow)
     {
         SDL_GL_SwapWindow( mWindow );
-        U32 mode = gSavedSettings.getU32("MPVBufferOptiMode");
-        if (mode == 0)
-        {
-            if(gGLManager.mIsApple) mode = 2;
-            else mode = 1;
-        }
-        if (mode > 2)
-        {
-            glClientWaitSync(swapFense, GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED);
-            glDeleteSync(swapFense);
-            swapFense = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-        }
     }
 }