darwin: Use clientattrib

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

diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
index 4c05013f3f61a2a3b6d3e5e098faf9ed042ffb7d..a3ee888288b52662cf85ff23140c22e60184c7f5 100644 (file)
--- a/src/glx/apple/Makefile
+++ b/src/glx/apple/Makefile
@@ -20,7 +20,7 @@ BUILD_DIR=builds
 
 all: $(BUILD_DIR)/libGL.1.2.dylib
 
-OBJECTS=glxext.o glxcmds.o glx_pbuffer.o glx_query.o glxcurrent.o glxextensions.o \
+OBJECTS=clientattrib.o glxext.o glxcmds.o glx_pbuffer.o glx_query.o glxcurrent.o glxextensions.o \
     appledri.o apple_glx_context.o apple_glx.o pixel.o \
     compsize.o apple_visual.o apple_cgl.o glxreply.o glcontextmodes.o \
     apple_xgl_api.o apple_glx_drawable.o xfont.o apple_glx_pbuffer.o \

diff --git a/src/glx/clientattrib.c b/src/glx/clientattrib.c
index a7dfb5348603444752fe2b4a44741ff519888f48..b26c17938db9d750d5d0387da85585d79ffe333c 100644 (file)
--- a/src/glx/clientattrib.c
+++ b/src/glx/clientattrib.c
@@ -35,6 +35,7 @@
 
 /*****************************************************************************/
 
+#ifndef GLX_USE_APPLEGL
 static void
 do_enable_disable(GLenum array, GLboolean val)
 {
@@ -123,6 +124,7 @@ __indirect_glPopClientAttrib(void)
       return;
    }
 }
+#endif
 
 void
 __glFreeAttributeState(__GLXcontext * gc)

diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index e9ec4c88c605d677177e68b72d888fe9b8905947..e74ae3472e526ffbaeb8a5a304a7523386afb5eb 100644 (file)
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -539,9 +539,7 @@ __glXFreeContext(__GLXcontext * gc)
       XFree((char *) gc->version);
    if (gc->extensions)
       XFree((char *) gc->extensions);
-#ifndef GLX_USE_APPLEGL /* TODO: clientattrib */
    __glFreeAttributeState(gc);
-#endif
    XFree((char *) gc->buf);
    Xfree((char *) gc->client_state_private);
    XFree((char *) gc);