diff options
| author | oy <Tom_Adams@web.de> | 2012-01-06 14:12:49 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2012-01-06 14:12:49 +0100 |
| commit | 71dd0c5aab9b4f2dd50b3e935db764a3868de83e (patch) | |
| tree | 56206926b61636ebc981a25f90547b32f5fbc0c7 | |
| parent | 12f76e7f8d935443bd4590af4ff12f95a3d4a94b (diff) | |
| download | zcatch-71dd0c5aab9b4f2dd50b3e935db764a3868de83e.tar.gz zcatch-71dd0c5aab9b4f2dd50b3e935db764a3868de83e.zip | |
made gfx_finish work again
| -rw-r--r-- | src/engine/client/backend_sdl.cpp | 3 | ||||
| -rw-r--r-- | src/engine/client/graphics_threaded.cpp | 1 | ||||
| -rw-r--r-- | src/engine/client/graphics_threaded.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp index 691d193c..3f74f87e 100644 --- a/src/engine/client/backend_sdl.cpp +++ b/src/engine/client/backend_sdl.cpp @@ -290,6 +290,9 @@ void CCommandProcessorFragment_SDL::Cmd_Shutdown(const SCommand_Shutdown *pComma void CCommandProcessorFragment_SDL::Cmd_Swap(const CCommandBuffer::SCommand_Swap *pCommand) { GL_SwapBuffers(m_GLContext); + + if(pCommand->m_Finish) + glFinish(); } void CCommandProcessorFragment_SDL::Cmd_VideoModes(const CCommandBuffer::SCommand_VideoModes *pCommand) diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp index 33670f7b..c6947e33 100644 --- a/src/engine/client/graphics_threaded.cpp +++ b/src/engine/client/graphics_threaded.cpp @@ -837,6 +837,7 @@ void CGraphics_Threaded::Swap() // add swap command CCommandBuffer::SCommand_Swap Cmd; + Cmd.m_Finish = g_Config.m_GfxFinish; m_pCommandBuffer->AddCommand(Cmd); // kick the command buffer diff --git a/src/engine/client/graphics_threaded.h b/src/engine/client/graphics_threaded.h index 51148f0f..f4f17ec2 100644 --- a/src/engine/client/graphics_threaded.h +++ b/src/engine/client/graphics_threaded.h @@ -199,6 +199,8 @@ public: struct SCommand_Swap : public SCommand { SCommand_Swap() : SCommand(CMD_SWAP) {} + + int m_Finish; }; struct SCommand_Texture_Create : public SCommand |