Merge branch 'master' into d3dretrace

[apitrace] / glretrace.hpp

diff --git a/glretrace.hpp b/glretrace.hpp
index 24268fe6d4b2fdb039658ff63b0b3abca3e00db1..8ba2a80edd477b8e2b418f0c21bfb76b57aace32 100644 (file)
--- a/glretrace.hpp
+++ b/glretrace.hpp
@@ -26,10 +26,8 @@
 #ifndef _GLRETRACE_HPP_
 #define _GLRETRACE_HPP_
 
-#include <ostream>
-
-#include "trace_parser.hpp"
 #include "glws.hpp"
+#include "retrace.hpp"
 
 
 namespace glretrace {
@@ -37,9 +35,8 @@ namespace glretrace {
 
 extern bool double_buffer;
 extern bool insideGlBeginEnd;
-extern Trace::Parser parser;
-extern glws::WindowSystem *ws;
-extern glws::Visual *visual;
+extern glws::Profile defaultProfile;
+extern glws::Visual *visual[glws::PROFILE_MAX];
 extern glws::Drawable *drawable;
 extern glws::Context *context;
 
@@ -48,21 +45,21 @@ extern long long startTime;
 extern bool wait;
 
 extern bool benchmark;
-extern const char *compare_prefix;
-extern const char *snapshot_prefix;
 
 extern unsigned dump_state;
 
 void
-checkGlError(int callIdx = -1);
-
-void retrace_call_glx(Trace::Call &call);
-void retrace_call_wgl(Trace::Call &call);
+checkGlError(trace::Call &call);
 
-void frame_complete(unsigned call_no);
+extern const retrace::Entry gl_callbacks[];
+extern const retrace::Entry cgl_callbacks[];
+extern const retrace::Entry glx_callbacks[];
+extern const retrace::Entry wgl_callbacks[];
+extern const retrace::Entry egl_callbacks[];
 
-void state_dump(std::ostream &os);
+void frame_complete(trace::Call &call);
 
+void updateDrawable(int width, int height);
 
 } /* namespace glretrace */