Merge branch 'main' into maint-b

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index eb689dc48c..cdd9cbd99a 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1255,6 +1255,18 @@ void LLWindowSDL::swapBuffers()
     if (mWindow)
     {
         SDL_GL_SwapWindow( mWindow );
+        U32 mode = gSavedSettings.getU32("MPVBuffMapMode");
+        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);
+        }
     }
 }