retrace: Handle glFrameTerminatorGREMEDY

ApiTrace thinks glFrameTerminatorGREMEDY is a frame terminator.  In
Dota, it immediately follows swapBuffers, causing FrameRetrace to think
half of the frames have zero calls.

Ignore glFrameTerminatorGREMEDY, to avoid this double counting of
frames.

3 files changed, 18 insertions, 4 deletions

diff --git a/retrace/daemon/glframe_retrace.cpp b/retrace/daemon/glframe_retrace.cpp
index 3d91330d..81a45175 100644
--- a/retrace/daemon/glframe_retrace.cpp
+++ b/retrace/daemon/glframe_retrace.cpp
@@ -145,7 +145,7 @@ FrameRetrace::openFile(const std::string &filename,
       retracer.retrace(*call);
       m_tracker.track(*call);
     }
-    const bool frame_boundary = call->flags & trace::CALL_FLAG_END_FRAME;
+    const bool frame_boundary = RetraceRender::endsFrame(*call);
     delete call;
     if (frame_boundary) {
       ++current_frame;
@@ -222,7 +222,7 @@ FrameState::FrameState(const std::string &filename,
   trace::Call *call;
   int current_frame = 0;
   while ((call = p->scan_call()) && current_frame < framenumber) {
-    if (call->flags & trace::CALL_FLAG_END_FRAME) {
+    if (RetraceRender::endsFrame(*call)) {
       ++current_frame;
       if (current_frame == framenumber) {
         delete call;
@@ -237,7 +237,7 @@ FrameState::FrameState(const std::string &filename,
       ++render_count;
     }
 
-    if (call->flags & trace::CALL_FLAG_END_FRAME) {
+    if (RetraceRender::endsFrame(*call)) {
       delete call;
       break;
     }
diff --git a/retrace/daemon/glframe_retrace_render.cpp b/retrace/daemon/glframe_retrace_render.cpp
index 1848c125..e41bc597 100644
--- a/retrace/daemon/glframe_retrace_render.cpp
+++ b/retrace/daemon/glframe_retrace_render.cpp
@@ -79,6 +79,19 @@ RetraceRender::isRender(const trace::Call &call) {
           || isClear(call));
 }
 
+bool
+RetraceRender::endsFrame(const trace::Call &c) {
+  if (c.flags & trace::CALL_FLAG_END_FRAME) {
+    // apitrace considers glFrameTerminatorGREMEDY to be a terminator,
+    // but this always follows swapbuffers when it exists.
+    if (strncmp("glFrameTerminatorGREMEDY", c.sig->name,
+                strlen("glFrameTerminatorGREMEDY")) == 0)
+      return false;
+    return true;
+  }
+  return false;
+}
+
 int
 RetraceRender::currentRenderBuffer() {
   glstate::Context context;
@@ -110,7 +123,7 @@ RetraceRender::RetraceRender(trace::AbstractParser *parser,
     tracker->flush();
     m_retracer->retrace(*call);
     tracker->track(*call);
-    m_end_of_frame = call->flags & trace::CALL_FLAG_END_FRAME;
+    m_end_of_frame = endsFrame(*call);
     const bool render = isRender(*call);
     compute = isCompute(*call);
     if (changesContext(*call)) {
diff --git a/retrace/daemon/glframe_retrace_render.hpp b/retrace/daemon/glframe_retrace_render.hpp
index 2dd1b515..af8113b1 100644
--- a/retrace/daemon/glframe_retrace_render.hpp
+++ b/retrace/daemon/glframe_retrace_render.hpp
@@ -75,6 +75,7 @@ class RetraceRender {
              OnFrameRetrace *callback);
   static bool isRender(const trace::Call &c);
   static bool changesContext(const trace::Call &c);
+  static bool endsFrame(const trace::Call &c);
   static int currentRenderBuffer();
 
  private: