trim: Use custom skiplist for required list (instead of std::set<unsigned>)

[apitrace] / cli / trace_analyzer.cpp

diff --git a/cli/trace_analyzer.cpp b/cli/trace_analyzer.cpp
index 803c81cde1b0c8f8d54725ff1a9120b61ea713dd..febeadb18a5bd3faa358083e49d220a27a1e075d 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);
     }
 }
 
@@ -715,7 +715,7 @@ TraceAnalyzer::requireDependencies(trace::Call *call)
     consume("state");
 }
 
-TraceAnalyzer::TraceAnalyzer(TrimFlags trimFlagsOpt = -1):
+TraceAnalyzer::TraceAnalyzer(TrimFlags trimFlagsOpt):
     transformFeedbackActive(false),
     framebufferObjectActive(false),
     insideBeginEnd(false),
@@ -754,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>  *
+trim::CallSet *
 TraceAnalyzer::get_required(void)
 {
     return &required;