piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "remove flag GL_SYNC_FLUSH_COMMANDS_BIT on syncing"

Browse Source 
This reverts commit 025f8d342f.
OSX may wait forever, so fix osx freeze
This commit is contained in:
degasus
2013-03-05 16:51:09 +01:00
parent d19bc15d26
commit 5534d7e8c3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
View File

@ -90,7 +90,7 @@ void StreamBuffer::Alloc ( size_t size, u32 stride )
// wait for new slots to end of buffer // wait for new slots to end of buffer
for(u32 i=SLOT(m_free_iterator)+1; i<=SLOT(iter_end) && i < SYNC_POINTS; i++) 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]); glDeleteSync(fences[i]);
} }
m_free_iterator = iter_end; m_free_iterator = iter_end;
@ -109,7 +109,7 @@ void StreamBuffer::Alloc ( size_t size, u32 stride )
// wait for space at the start // wait for space at the start
for(u32 i=0; i<=SLOT(iter_end); i++) 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]); glDeleteSync(fences[i]);
} }
m_free_iterator = iter_end; m_free_iterator = iter_end;