apple: Change ifdefs for DRI to be DRI && !APPLE

Signed-off-by: Jeremy Huddleston <[email protected]>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/glx/apple/apple_xgl_api_read.c b/src/glx/apple/apple_xgl_api_read.c
index 3dcb31b71ae..36357c7fc2e 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 b50e3119cdf..7dd946f764e 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 d3fbc7c41e0..f556eefa226 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);
 }