typedef std::map<unsigned long long, glws::Drawable *> DrawableMap;
-typedef std::map<unsigned long long, glws::Context *> ContextMap;
+typedef std::map<unsigned long long, Context *> ContextMap;
typedef std::map<unsigned long long, glws::Profile> ProfileMap;
static DrawableMap drawable_map;
static ContextMap context_map;
return (it != drawable_map.end()) ? it->second : NULL;
}
-static glws::Context *
+static Context *
getContext(unsigned long long context_ptr) {
if (context_ptr == 0) {
return NULL;
it = drawable_map.find(orig_surface);
if (it != drawable_map.end()) {
- if (it->second != currentDrawable) {
+ glretrace::Context *currentContext = glretrace::getCurrentContext();
+ if (!currentContext || it->second != currentContext->drawable) {
// TODO: reference count
delete it->second;
}
static void retrace_eglBindAPI(trace::Call &call) {
current_api = call.arg(0).toUInt();
+ eglBindAPI(current_api);
}
static void retrace_eglCreateContext(trace::Call &call) {
unsigned long long orig_context = call.ret->toUIntPtr();
unsigned long long orig_config = call.arg(1).toUIntPtr();
- glws::Context *share_context = getContext(call.arg(2).toUIntPtr());
- trace::Array *attrib_array = dynamic_cast<trace::Array *>(&call.arg(3));
+ Context *share_context = getContext(call.arg(2).toUIntPtr());
+ trace::Array *attrib_array = call.arg(3).toArray();
glws::Profile profile;
switch (current_api) {
}
- glws::Context *context = glretrace::createContext(share_context, profile);
+ Context *context = glretrace::createContext(share_context, profile);
if (!context) {
const char *name;
switch (profile) {
}
retrace::warning(call) << "Failed to create " << name << " context.\n";
- os::abort();
+ exit(1);
}
context_map[orig_context] = context;
it = context_map.find(orig_context);
if (it != context_map.end()) {
- delete it->second;
+ glretrace::Context *currentContext = glretrace::getCurrentContext();
+ if (it->second != currentContext) {
+ // TODO: reference count
+ delete it->second;
+ }
context_map.erase(it);
}
}
static void retrace_eglMakeCurrent(trace::Call &call) {
glws::Drawable *new_drawable = getDrawable(call.arg(1).toUIntPtr());
- glws::Context *new_context = getContext(call.arg(3).toUIntPtr());
+ Context *new_context = getContext(call.arg(3).toUIntPtr());
glretrace::makeCurrent(call, new_drawable, new_context);
}
static void retrace_eglSwapBuffers(trace::Call &call) {
+ glws::Drawable *drawable = getDrawable(call.arg(1).toUIntPtr());
+
frame_complete(call);
- if (retrace::doubleBuffer && currentDrawable) {
- currentDrawable->swapBuffers();
+ if (retrace::doubleBuffer) {
+ if (drawable) {
+ drawable->swapBuffers();
+ }
} else {
glFlush();
}