Rename trim::CallSet to trace::FastCallSet

[apitrace] / cli / trace_analyzer.cpp

diff --git a/cli/trace_analyzer.cpp b/cli/trace_analyzer.cpp
index 730dab91b08d8478d001ed75d319938a2d55894d..f98eaa75abb16d0b7acd732563e1c7b699e4e8b2 100644 (file)
--- a/cli/trace_analyzer.cpp
+++ b/cli/trace_analyzer.cpp
@@ -162,7 +162,7 @@ TraceAnalyzer::consume(std::string resource)
     resources.erase(resource);
 
     for (call = calls.begin(); call != calls.end(); call++) {
-        required.insert(*call);
+        required.add(*call);
     }
 }
 
@@ -271,12 +271,6 @@ TraceAnalyzer::callHasNoSideEffects(trace::Call *call, const char *name)
         return true;
     }
 
-    /* Similarly, swap-buffers calls don't have interesting side effects. */
-    if (call->flags & trace::CALL_FLAG_SWAP_RENDERTARGET &&
-        call->flags & trace::CALL_FLAG_END_FRAME) {
-        return true;
-    }
-
     /* Not known as a no-side-effect call. Return false for more analysis. */
     return false;
 }
@@ -760,13 +754,13 @@ TraceAnalyzer::require(trace::Call *call)
     requireDependencies(call);
 
     /* Then insert this call itself. */
-    required.insert(call->no);
+    required.add(call->no);
 }
 
 /* Return a set of all the required calls, (both those calls added
  * explicitly with require() and those implicitly depended
  * upon. */
-std::set<unsigned>  *
+trace::FastCallSet *
 TraceAnalyzer::get_required(void)
 {
     return &required;