X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=glretrace.hpp;h=aacd67ea592853aad79f632adb86ca0324c60d80;hb=32420d2167c14c4c00d351e8807031b64bce06ef;hp=dcac8f0da70beee3a4b567d3b184bf821e7bfa06;hpb=31c9f62616e2c59973ca00fd074e8c288f6488b3;p=apitrace

diff --git a/glretrace.hpp b/glretrace.hpp
index dcac8f0..aacd67e 100644
--- a/glretrace.hpp
+++ b/glretrace.hpp
@@ -26,10 +26,9 @@
 #ifndef _GLRETRACE_HPP_
 #define _GLRETRACE_HPP_
 
-#include <ostream>
-
 #include "trace_parser.hpp"
 #include "glws.hpp"
+#include "retrace.hpp"
 
 
 namespace glretrace {
@@ -37,8 +36,7 @@ namespace glretrace {
 
 extern bool double_buffer;
 extern bool insideGlBeginEnd;
-extern Trace::Parser parser;
-extern glws::WindowSystem *ws;
+extern trace::Parser parser;
 extern glws::Visual *visual;
 extern glws::Drawable *drawable;
 extern glws::Context *context;
@@ -47,24 +45,32 @@ extern unsigned frame;
 extern long long startTime;
 extern bool wait;
 
+enum frequency {
+    FREQUENCY_NEVER = 0,
+    FREQUENCY_FRAME,
+    FREQUENCY_FRAMEBUFFER,
+    FREQUENCY_DRAW,
+};
+
 extern bool benchmark;
 extern const char *compare_prefix;
 extern const char *snapshot_prefix;
+extern enum frequency snapshot_frequency;
 
 extern unsigned dump_state;
 
 void
-checkGlError(Trace::Call &call);
+checkGlError(trace::Call &call);
 
-void retrace_call_cgl(Trace::Call &call);
-void retrace_call_glx(Trace::Call &call);
-void retrace_call_wgl(Trace::Call &call);
+extern const retrace::Entry gl_callbacks[];
+extern const retrace::Entry cgl_callbacks[];
+extern const retrace::Entry glx_callbacks[];
+extern const retrace::Entry wgl_callbacks[];
 
 void snapshot(unsigned call_no);
-void frame_complete(unsigned call_no);
-
-void state_dump(std::ostream &os);
+void frame_complete(trace::Call &call);
 
+void updateDrawable(int width, int height);
 
 } /* namespace glretrace */