apple: More fixes for compilation failures

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

diff --git a/src/glx/applegl_glx.c b/src/glx/applegl_glx.c
index 660566f31713ad5d8b08fce96e0fc15f8fc225a4..ff899df377098df2bb496db0b04dccc798ee7d18 100644 (file)
--- a/src/glx/applegl_glx.c
+++ b/src/glx/applegl_glx.c
@@ -52,7 +52,7 @@ 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");
@@ -93,7 +93,7 @@ static const struct glx_context_vtable applegl_context_vtable = {
 
 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;
@@ -108,7 +108,7 @@ applegl_create_context(struct glx_screen *psc,
    if (gc == NULL)
       return NULL;
 
-   if (!glx_context_init(gc, psc, mode)) {
+   if (!glx_context_init(gc, psc, config)) {
       Xfree(gc);
       return NULL;
    }
@@ -120,7 +120,7 @@ applegl_create_context(struct glx_screen *psc,
    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,8 +129,8 @@ 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. */