From f52de8d216e0cca5cd203d26ba7ba05b64df54ad Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 21 Feb 2018 18:33:15 +0000 Subject: [PATCH] Be careful not to overlap multidraws in GL when replaying event-to-event --- renderdoc/driver/gl/gl_overlay.cpp | 6 +++--- renderdoc/driver/gl/gl_postvs.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/gl/gl_overlay.cpp b/renderdoc/driver/gl/gl_overlay.cpp index 29bfed516..fef3fac26 100644 --- a/renderdoc/driver/gl/gl_overlay.cpp +++ b/renderdoc/driver/gl/gl_overlay.cpp @@ -767,7 +767,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOve m_pDriver->ReplayLog(events[i], events[i], eReplay_OnlyDraw); if(overlay == DebugOverlay::ClearBeforePass && i + 1 < events.size()) - m_pDriver->ReplayLog(events[i], events[i + 1], eReplay_WithoutDraw); + m_pDriver->ReplayLog(events[i] + 1, events[i + 1], eReplay_WithoutDraw); } } } @@ -1139,7 +1139,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOve m_pDriver->ReplayLog(0, events[i], eReplay_OnlyDraw); if(i + 1 < events.size()) - m_pDriver->ReplayLog(events[i], events[i + 1], eReplay_WithoutDraw); + m_pDriver->ReplayLog(events[i] + 1, events[i + 1], eReplay_WithoutDraw); } } @@ -1336,7 +1336,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOve m_pDriver->ReplayLog(0, events[i], eReplay_OnlyDraw); if(i + 1 < events.size()) - m_pDriver->ReplayLog(events[i], events[i + 1], eReplay_WithoutDraw); + m_pDriver->ReplayLog(events[i] + 1, events[i + 1], eReplay_WithoutDraw); } } diff --git a/renderdoc/driver/gl/gl_postvs.cpp b/renderdoc/driver/gl/gl_postvs.cpp index 3ec180fe4..7c4a64db8 100644 --- a/renderdoc/driver/gl/gl_postvs.cpp +++ b/renderdoc/driver/gl/gl_postvs.cpp @@ -1386,7 +1386,8 @@ void GLReplay::InitPostVSBuffers(const vector &passEvents) { if(prev != passEvents[i]) { - m_pDriver->ReplayLog(prev, passEvents[i], eReplay_WithoutDraw); + m_pDriver->ReplayLog(prev, prev, eReplay_OnlyDraw); + m_pDriver->ReplayLog(prev + 1, passEvents[i], eReplay_WithoutDraw); prev = passEvents[i]; }