namespace glretrace {
-glws::Drawable *currentDrawable = NULL;
Context *currentContext = NULL;
bool
makeCurrent(trace::Call &call, glws::Drawable *drawable, Context *context)
{
+ glws::Drawable *currentDrawable = currentContext ? currentContext->drawable : NULL;
+
if (drawable == currentDrawable && context == currentContext) {
return true;
}
- if (currentDrawable && currentContext) {
+ if (currentContext) {
glFlush();
if (!retrace::doubleBuffer) {
frame_complete(call);
return false;
}
+ if (currentContext) {
+ currentContext->drawable = NULL;
+ }
+
if (drawable && context) {
- currentDrawable = drawable;
currentContext = context;
+ currentContext->drawable = drawable;
if (!context->used) {
initContext();
context->used = true;
}
} else {
- currentDrawable = NULL;
currentContext = NULL;
}
*/
void
updateDrawable(int width, int height) {
- if (!currentDrawable) {
+ if (!currentContext) {
return;
}
+ glws::Drawable *currentDrawable = currentContext->drawable;
+ assert(currentDrawable);
+
if (currentDrawable->visible &&
width <= currentDrawable->width &&
height <= currentDrawable->height) {