From 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 1 Apr 2010 11:17:04 -0700 Subject: apple: Change ifdefs for DRI to be DRI && !APPLE Signed-off-by: Jeremy Huddleston --- src/glx/apple/apple_xgl_api_read.c | 6 +++--- src/glx/apple/apple_xgl_api_stereo.c | 4 ++-- src/glx/apple/apple_xgl_api_viewport.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/glx/apple') diff --git a/src/glx/apple/apple_xgl_api_read.c b/src/glx/apple/apple_xgl_api_read.c index 3dcb31b71a..36357c7fc2 100644 --- a/src/glx/apple/apple_xgl_api_read.c +++ b/src/glx/apple/apple_xgl_api_read.c @@ -68,10 +68,10 @@ SetRead(struct apple_xgl_saved_state *saved) saved->swapped = true; - if (apple_glx_make_current_context(dpy, gc->apple, gc->apple, + if (apple_glx_make_current_context(dpy, gc->driContext, gc->driContext, gc->currentReadable)) { /* An error occurred, so try to restore the old context state. */ - (void) apple_glx_make_current_context(dpy, gc->apple, gc->apple, + (void) apple_glx_make_current_context(dpy, gc->driContext, gc->driContext, gc->currentDrawable); saved->swapped = false; } @@ -85,7 +85,7 @@ UnsetRead(struct apple_xgl_saved_state *saved) GLXContext gc = __glXGetCurrentContext(); Display *dpy = glXGetCurrentDisplay(); - if (apple_glx_make_current_context(dpy, gc->apple, gc->apple, + if (apple_glx_make_current_context(dpy, gc->driContext, gc->driContext, gc->currentDrawable)) { /* * An error occurred restoring the drawable. diff --git a/src/glx/apple/apple_xgl_api_stereo.c b/src/glx/apple/apple_xgl_api_stereo.c index b50e3119cd..7dd946f764 100644 --- a/src/glx/apple/apple_xgl_api_stereo.c +++ b/src/glx/apple/apple_xgl_api_stereo.c @@ -42,7 +42,7 @@ glDrawBuffer(GLenum mode) { GLXContext gc = glXGetCurrentContext(); - if (gc && apple_glx_context_uses_stereo(gc->apple)) { + if (gc && apple_glx_context_uses_stereo(gc->driContext)) { GLenum buf[2]; GLsizei n = 0; @@ -77,7 +77,7 @@ glDrawBuffers(GLsizei n, const GLenum * bufs) { GLXContext gc = glXGetCurrentContext(); - if (gc && apple_glx_context_uses_stereo(gc->apple)) { + if (gc && apple_glx_context_uses_stereo(gc->driContext)) { GLenum newbuf[n + 2]; GLsizei i, outi = 0; bool have_back = false; diff --git a/src/glx/apple/apple_xgl_api_viewport.c b/src/glx/apple/apple_xgl_api_viewport.c index d3fbc7c41e..f556eefa22 100644 --- a/src/glx/apple/apple_xgl_api_viewport.c +++ b/src/glx/apple/apple_xgl_api_viewport.c @@ -38,8 +38,8 @@ glViewport(GLint x, GLint y, GLsizei width, GLsizei height) GLXContext gc = __glXGetCurrentContext(); Display *dpy = glXGetCurrentDisplay(); - if (gc && gc->apple) - apple_glx_context_update(dpy, gc->apple); + if (gc && gc->driContext) + apple_glx_context_update(dpy, gc->driContext); __gl_api.Viewport(x, y, width, height); } -- cgit v1.2.3