replay: Support applications mixing glCreateProgramObjectARB and glUseProgram

[apitrace] / retrace / glretrace.hpp

diff --git a/retrace/glretrace.hpp b/retrace/glretrace.hpp
index 568049ecb710620eba4e24f2846d56ea7c25cbab..7441b56938e22481e0110b181b74b7de81a55c98 100644 (file)
--- a/retrace/glretrace.hpp
+++ b/retrace/glretrace.hpp
@@ -35,27 +35,40 @@ namespace glretrace {
 struct Context {
     Context(glws::Context* context)
         : wsContext(context),
+          drawable(0),
           activeProgram(0),
           used(false)
     {
     }
 
-    ~Context()
-    {
-        delete wsContext;
-    }
+    ~Context();
 
     glws::Context* wsContext;
+
+    // Bound drawable
+    glws::Drawable *drawable;
+
     GLuint activeProgram;
     bool used;
+    
+    // Context must be current
+    inline bool
+    hasExtension(const char *extension) const {
+        return wsContext->hasExtension(extension);
+    }
 };
 
 extern bool insideList;
 extern bool insideGlBeginEnd;
+extern bool supportsARBShaderObjects;
 
+Context *
+getCurrentContext(void);
+
+
+int
+parseAttrib(const trace::Value *attribs, int param, int default_);
 
-extern glws::Drawable *currentDrawable;
-extern Context *currentContext;
 
 glws::Drawable *
 createDrawable(glws::Profile profile);
@@ -63,6 +76,9 @@ createDrawable(glws::Profile profile);
 glws::Drawable *
 createDrawable(void);
 
+glws::Drawable *
+createPbuffer(int width, int height);
+
 Context *
 createContext(Context *shareContext, glws::Profile profile);
 
@@ -82,7 +98,6 @@ extern const retrace::Entry glx_callbacks[];
 extern const retrace::Entry wgl_callbacks[];
 extern const retrace::Entry egl_callbacks[];
 
-void frame_start();
 void frame_complete(trace::Call &call);
 void initContext();