diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:57:01 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:57:01 +0800 |
| commit | e8c39210bdb1cc1775cb37d539a00db2c817aed3 (patch) | |
| tree | 94ba8edddce15c93a5e5d93db99bbc3bad146962 /indra/llwindow/llwindowmacosx.cpp | |
| parent | 551224d0d0c0d8866432b3610e9c042a3f4ad6ba (diff) | |
| parent | 84908dd8001bacf88786e5630ce80c47944c400a (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
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() |