Merge branch 'master' into d3dretrace

[apitrace] / glretrace.hpp

diff --git a/glretrace.hpp b/glretrace.hpp
index b9d0f1a217a183d05207acbdc267bd116250aa5f..8ba2a80edd477b8e2b418f0c21bfb76b57aace32 100644 (file)
--- a/glretrace.hpp
+++ b/glretrace.hpp
@@ -26,7 +26,6 @@
 #ifndef _GLRETRACE_HPP_
 #define _GLRETRACE_HPP_
 
-#include "trace_parser.hpp"
 #include "glws.hpp"
 #include "retrace.hpp"
 
@@ -36,8 +35,8 @@ namespace glretrace {
 
 extern bool double_buffer;
 extern bool insideGlBeginEnd;
-extern Trace::Parser parser;
-extern glws::Visual *visual;
+extern glws::Profile defaultProfile;
+extern glws::Visual *visual[glws::PROFILE_MAX];
 extern glws::Drawable *drawable;
 extern glws::Context *context;
 
@@ -45,30 +44,20 @@ 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);
 
 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 snapshot(unsigned call_no);
-void frame_complete(Trace::Call &call);
+void frame_complete(trace::Call &call);
 
 void updateDrawable(int width, int height);