From 5534d7e8c34c1b5b9c2d4c581f6f618476a7ba9b Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 5 Mar 2013 16:51:09 +0100 Subject: [PATCH] Revert "remove flag GL_SYNC_FLUSH_COMMANDS_BIT on syncing" This reverts commit 025f8d342fe5f828004026b97b90b4b71469c331. OSX may wait forever, so fix osx freeze --- Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp index 9c5af140ec..24951219fa 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp @@ -90,7 +90,7 @@ void StreamBuffer::Alloc ( size_t size, u32 stride ) // wait for new slots to end of buffer for(u32 i=SLOT(m_free_iterator)+1; i<=SLOT(iter_end) && i < SYNC_POINTS; i++) { - glClientWaitSync(fences[i], 0, GL_TIMEOUT_IGNORED); + glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED); glDeleteSync(fences[i]); } m_free_iterator = iter_end; @@ -109,7 +109,7 @@ void StreamBuffer::Alloc ( size_t size, u32 stride ) // wait for space at the start for(u32 i=0; i<=SLOT(iter_end); i++) { - glClientWaitSync(fences[i], 0, GL_TIMEOUT_IGNORED); + glClientWaitSync(fences[i], GL_SYNC_FLUSH_COMMANDS_BIT, GL_TIMEOUT_IGNORED); glDeleteSync(fences[i]); } m_free_iterator = iter_end;