X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glretrace.hpp;h=aacd67ea592853aad79f632adb86ca0324c60d80;hb=33b8ba3bd173bcb6cebbc0d2e1ed3320077a8ac3;hp=5b93f2d82b026893f1551ab200cf13563a731b7a;hpb=1c35c914cf934c957664d9692a099634aacc4e44;p=apitrace

diff --git a/glretrace.hpp b/glretrace.hpp
index 5b93f2d..aacd67e 100644
--- a/glretrace.hpp
+++ b/glretrace.hpp
@@ -28,6 +28,7 @@
 
 #include "trace_parser.hpp"
 #include "glws.hpp"
+#include "retrace.hpp"
 
 
 namespace glretrace {
@@ -35,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;
@@ -60,14 +60,15 @@ 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 frame_complete(trace::Call &call);
 
 void updateDrawable(int width, int height);