X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fretrace.hpp;h=56cebc6195135dfcd7f7e0bf51158f1bf0ede755;hb=6f81033cecdb1b5663a3eaefba42fd4bd36211c1;hp=c1e556a97fbb03d726be09de3cb92540de88e5fc;hpb=9d27a54b0381610c30964880a5fdd4c27bb6e732;p=apitrace

diff --git a/retrace/retrace.hpp b/retrace/retrace.hpp
index c1e556a..56cebc6 100644
--- a/retrace/retrace.hpp
+++ b/retrace/retrace.hpp
@@ -36,54 +36,19 @@
 
 #include "trace_model.hpp"
 #include "trace_parser.hpp"
+#include "trace_profiler.hpp"
 
 
-namespace retrace {
-
-
-extern trace::Parser parser;
+namespace image {
+    class Image;
+}
 
 
-/**
- * Handle map.
- *
- * It is just like a regular std::map<T, T> container, but lookups of missing
- * keys return the key instead of default constructor.
- *
- * This is necessary for several GL named objects, where one can either request
- * the implementation to generate an unique name, or pick a value never used
- * before.
- *
- * XXX: In some cases, instead of returning the key, it would make more sense
- * to return an unused data value (e.g., container count).
- */
-template <class T>
-class map
-{
-private:
-    typedef std::map<T, T> base_type;
-    base_type base;
+namespace retrace {
 
-public:
 
-    T & operator[] (const T &key) {
-        typename base_type::iterator it;
-        it = base.find(key);
-        if (it == base.end()) {
-            return (base[key] = key);
-        }
-        return it->second;
-    }
-    
-    const T & operator[] (const T &key) const {
-        typename base_type::const_iterator it;
-        it = base.find(key);
-        if (it == base.end()) {
-            return (base[key] = key);
-        }
-        return it->second;
-    }
-};
+extern trace::Parser parser;
+extern trace::Profiler profiler;
 
 
 /**
@@ -101,9 +66,8 @@ public:
 
     inline void *
     alloc(size_t size) {
-        if (!size) {
-            return NULL;
-        }
+        /* Always return valid address, even when size is zero */
+        size = std::max(size, sizeof(uintptr_t));
 
         uintptr_t * buf = static_cast<uintptr_t *>(malloc(sizeof(uintptr_t) + size));
         if (!buf) {
@@ -170,25 +134,35 @@ public:
 };
 
 
-void
-addRegion(unsigned long long address, void *buffer, unsigned long long size);
-
-void
-delRegionByPointer(void *ptr);
-
-void *
-toPointer(trace::Value &value, bool bind = false);
-
-
 /**
  * Output verbosity when retracing files.
  */
 extern int verbosity;
 
+/**
+ * Debugging checks.
+ */
+extern bool debug;
+
 /**
  * Add profiling data to the dump when retracing.
  */
 extern bool profiling;
+extern bool profilingCpuTimes;
+extern bool profilingGpuTimes;
+extern bool profilingPixelsDrawn;
+
+/**
+ * State dumping.
+ */
+extern bool dumpingState;
+
+
+extern bool doubleBuffer;
+extern bool coreProfile;
+
+extern unsigned frameNo;
+extern unsigned callNo;
 
 
 std::ostream &warning(trace::Call &call);
@@ -237,6 +211,31 @@ public:
 };
 
 
+void
+setUp(void);
+
+void
+addCallbacks(retrace::Retracer &retracer);
+
+void
+frameComplete(trace::Call &call);
+
+image::Image *
+getSnapshot(void);
+
+bool
+dumpState(std::ostream &os);
+
+void
+flushRendering(void);
+
+void
+waitForInput(void);
+
+void
+cleanUp(void);
+
+
 } /* namespace retrace */
 
 #endif /* _RETRACE_HPP_ */