diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-04-02 00:54:57 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-04-27 11:26:51 -0700 |
| commit | 163901bc7f89dc3a5c65d66b960f18dd561631c1 (patch) | |
| tree | 374377f5bd493262165c323d4ca1292df810ec9b | |
| parent | 80b280db883edc9550484dba03bd5c124b6a9bf9 (diff) | |
darwin: Use clientattrib
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/glx/apple/Makefile | 2 | ||||
| -rw-r--r-- | src/glx/clientattrib.c | 2 | ||||
| -rw-r--r-- | src/glx/glxcmds.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile index 4c05013f3f..a3ee888288 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 a7dfb53486..b26c17938d 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 e9ec4c88c6..e74ae3472e 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); |