ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert move capture right before glfencesync if possible

Browse Source
This commit is contained in:
Benau 2017-04-13 15:13:47 +08:00
parent 4de0ca83aa
commit f3e0d2f9e9
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/graphics/draw_calls.cpp
View File

@ -34,9 +34,6 @@
#include "utils/profiler.hpp" #include "utils/profiler.hpp"
#include <numeric> #include <numeric>
#ifdef ENABLE_RECORDER
#include <openglrecorder.h>
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void DrawCalls::clearLists() void DrawCalls::clearLists()
@ -649,15 +646,6 @@ void DrawCalls::prepareDrawCalls( ShadowMatrices& shadow_matrices,
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
irr_driver->setSkinningJoint(getSkinningOffset()); irr_driver->setSkinningJoint(getSkinningOffset());
#ifdef ENABLE_RECORDER
if (irr_driver->isRecording())
{
PROFILER_PUSH_CPU_MARKER("- Recording", 0x0, 0x50, 0x40);
ogrCapture();
PROFILER_POP_CPU_MARKER();
}
#endif
// Add a 1 s timeout // Add a 1 s timeout
if (!m_sync) if (!m_sync)
m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);

6
src/graphics/irr_driver.cpp
View File

@ -1964,8 +1964,12 @@ void IrrDriver::update(float dt)
//if(World::getWorld() && World::getWorld()->isRacePhase()) //if(World::getWorld() && World::getWorld()->isRacePhase())
// printRenderStats(); // printRenderStats();
#ifdef ENABLE_RECORDER #ifdef ENABLE_RECORDER
if (!world && m_recording) if (m_recording)
{
PROFILER_PUSH_CPU_MARKER("- Recording", 0x0, 0x50, 0x40);
ogrCapture(); ogrCapture();
PROFILER_POP_CPU_MARKER();
}
#endif #endif
} // update } // update