From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri, 2 Apr 2010 07:54:57 +0000 (-0700)
Subject: darwin: Use clientattrib
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=163901bc7f89dc3a5c65d66b960f18dd561631c1;p=mesa.git

darwin: Use clientattrib

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

diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
index 4c05013f3f6..a3ee888288b 100644
--- 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 a7dfb534860..b26c17938db 100644
--- 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 e9ec4c88c60..e74ae3472e5 100644
--- 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);