Mesa (master): apple: Finish build fixes for applegl_glx.c

Jeremy Huddleston jeremyhu at kemper.freedesktop.org
Mon Jun 6 08:41:44 PDT 2011


Module: Mesa
Branch: master
Commit: 2ee5272e1671aff8c8d9e0c12bf37ed006717283
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ee5272e1671aff8c8d9e0c12bf37ed006717283

Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jun  6 11:27:19 2011 -0400

apple: Finish build fixes for applegl_glx.c

libGL.dylib now *builds* on darwin.

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

---

 src/glx/applegl_glx.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/glx/applegl_glx.c b/src/glx/applegl_glx.c
index ff899df..9b8605f 100644
--- a/src/glx/applegl_glx.c
+++ b/src/glx/applegl_glx.c
@@ -99,7 +99,8 @@ applegl_create_context(struct glx_screen *psc,
    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. */
@@ -113,8 +114,6 @@ applegl_create_context(struct glx_screen *psc,
       return NULL;
    }
 
-   dpy = gc->psc->dpy;
-
    gc->vtable = &applegl_context_vtable;
    gc->driContext = NULL;
    gc->do_destroy = False;



More information about the mesa-commit mailing list