static void
applegl_unbind_context(struct glx_context *gc, struct glx_context *new)
{
+ Display *dpy;
+ bool error;
+
+ /* If we don't have a context, then we have nothing to unbind */
+ if (!gc)
+ return;
+
+ /* If we have a new context, keep this one around and remove it during bind. */
+ if (new)
+ return;
+
+ dpy = gc->psc->dpy;
+
+ error = apple_glx_make_current_context(dpy,
+ (gc != &dummyContext) ? gc->driContext : NULL,
+ NULL, None);
+
+ apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO");
}
static void
/* TODO: Integrate this with apple_glx_create_context and make
* struct apple_glx_context inherit from struct glx_context. */
- gc = Xcalloc(1, sizeof (*gc));
+ gc = calloc(1, sizeof(*gc));
if (gc == NULL)
return NULL;
if (!glx_context_init(gc, psc, config)) {
- Xfree(gc);
+ free(gc);
return NULL;
}
{
struct glx_screen *psc;
- psc = Xmalloc(sizeof *psc);
+ psc = calloc(1, sizeof *psc);
if (psc == NULL)
return NULL;
- memset(psc, 0, sizeof *psc);
glx_screen_init(psc, screen, priv);
psc->vtable = &applegl_screen_vtable;