Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / glx / applegl_glx.c

diff --git a/src/glx/applegl_glx.c b/src/glx/applegl_glx.c
index 660566f31713ad5d8b08fce96e0fc15f8fc225a4..c086e5146a84f1f3d2ad77d1ba772c89e19fb11a 100644 (file)
--- a/src/glx/applegl_glx.c
+++ b/src/glx/applegl_glx.c
@@ -34,16 +34,18 @@
 #if defined(GLX_USE_APPLEGL)
 
 #include <stdbool.h>
+#include <dlfcn.h>
 
 #include "glxclient.h"
-#include "apple_glx_context.h"
-#include "apple_glx.h"
+#include "apple/apple_glx_context.h"
+#include "apple/apple_glx.h"
+#include "apple/apple_cgl.h"
 #include "glx_error.h"
 
 static void
 applegl_destroy_context(struct glx_context *gc)
 {
-   apple_glx_destroy_context(&gc->driContext, gc->currentDpy);
+   apple_glx_destroy_context(&gc->driContext, gc->psc->dpy);
 }
 
 static int
@@ -52,19 +54,39 @@ applegl_bind_context(struct glx_context *gc, struct glx_context *old,
 {
    Display *dpy = gc->psc->dpy;
    bool error = apple_glx_make_current_context(dpy,
-                                              (oldGC && oldGC != &dummyContext) ? oldGC->driContext : NULL
+                                              (old && old != &dummyContext) ? old->driContext : NULL,
                                               gc ? gc->driContext : NULL, draw);
 
    apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO");
    if (error)
       return 1; /* GLXBadContext is the same as Success (0) */
 
+   apple_glapi_set_dispatch();
+
    return Success;
 }
 
 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
@@ -80,47 +102,52 @@ applegl_wait_x(struct glx_context *gc)
    apple_glx_waitx(dpy, gc->driContext);
 }
 
+static void *
+applegl_get_proc_address(const char *symbol)
+{
+   return dlsym(apple_cgl_get_dl_handle(), symbol);
+}
+
 static const struct glx_context_vtable applegl_context_vtable = {
-   applegl_destroy_context,
-   applegl_bind_context,
-   applegl_unbind_context,
-   applegl_wait_gl,
-   applegl_wait_x,
-   DRI_glXUseXFont,
-   NULL, /* bind_tex_image, */
-   NULL, /* release_tex_image, */
+   .destroy             = applegl_destroy_context,
+   .bind                = applegl_bind_context,
+   .unbind              = applegl_unbind_context,
+   .wait_gl             = applegl_wait_gl,
+   .wait_x              = applegl_wait_x,
+   .use_x_font          = DRI_glXUseXFont,
+   .bind_tex_image      = NULL,
+   .release_tex_image   = NULL,
+   .get_proc_address    = applegl_get_proc_address,
 };
 
 struct glx_context *
 applegl_create_context(struct glx_screen *psc,
-                      struct glx_config *mode,
+                      struct glx_config *config,
                       struct glx_context *shareList, int renderType)
 {
    struct glx_context *gc;
    int errorcode;
    bool x11error;
-   Display *dpy;
+   Display *dpy = psc->dpy;
+   int screen = psc->scr;
 
    /* 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, mode)) {
-      Xfree(gc);
+   if (!glx_context_init(gc, psc, config)) {
+      free(gc);
       return NULL;
    }
 
-   dpy = gc->psc->dpy;
-
    gc->vtable = &applegl_context_vtable;
    gc->driContext = NULL;
-   gc->do_destroy = False;
 
    /* TODO: darwin: Integrate with above to do indirect */
-   if(apple_glx_create_context(&gc->driContext, dpy, screen, fbconfig, 
+   if(apple_glx_create_context(&gc->driContext, dpy, screen, config, 
                               shareList ? shareList->driContext : NULL,
                               &errorcode, &x11error)) {
       __glXSendError(dpy, errorcode, 0, X_GLXCreateContext, x11error);
@@ -129,16 +156,19 @@ applegl_create_context(struct glx_screen *psc,
    }
 
    gc->currentContextTag = -1;
-   gc->mode = fbconfig;
-   gc->isDirect = 1;
+   gc->config = config;
+   gc->isDirect = GL_TRUE;
    gc->xid = 1; /* Just something not None, so we know when to destroy
                 * it in MakeContextCurrent. */
 
    return gc;
 }
 
-struct glx_screen_vtable applegl_screen_vtable = {
-   applegl_create_context
+static const struct glx_screen_vtable applegl_screen_vtable = {
+   .create_context         = applegl_create_context,
+   .create_context_attribs = NULL,
+   .query_renderer_integer = NULL,
+   .query_renderer_string  = NULL,
 };
 
 _X_HIDDEN struct glx_screen *
@@ -146,11 +176,10 @@ applegl_create_screen(int screen, struct glx_display * priv)
 {
    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;