glx/meson: use full include path for dri_interface.h

[mesa.git] / src / glx / apple / apple_xgl_api_stereo.c

diff --git a/src/glx/apple/apple_xgl_api_stereo.c b/src/glx/apple/apple_xgl_api_stereo.c
index 64a15f748611352273395d809f1f6acc431aed65..0d2f6fa6531778c2112c7ffa585e29b0d2d02603 100644 (file)
--- a/src/glx/apple/apple_xgl_api_stereo.c
+++ b/src/glx/apple/apple_xgl_api_stereo.c
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2009 Apple Inc.
+ Copyright (c) 2009-2011 Apple Inc.
  
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation files
@@ -40,18 +40,21 @@
 #include "glxclient.h"
 #include "apple_glx_context.h"
 #include "apple_xgl_api.h"
+#include "main/glheader.h"
+#include "glapitable.h"
+
+extern struct _glapi_table * __ogl_framework_api;
 
-extern struct apple_xgl_api __gl_api;
 /* 
  * These are special functions for stereoscopic support 
  * differences in MacOS X.
  */
 void
-glDrawBuffer(GLenum mode)
+__applegl_glDrawBuffer(GLenum mode)
 {
-   GLXContext gc = glXGetCurrentContext();
+   struct glx_context * gc = __glXGetCurrentContext();
 
-   if (gc && apple_glx_context_uses_stereo(gc->driContext)) {
+   if (gc != &dummyContext && apple_glx_context_uses_stereo(gc->driContext)) {
       GLenum buf[2];
       GLsizei n = 0;
 
@@ -73,20 +76,20 @@ glDrawBuffer(GLenum mode)
          break;
       }
 
-      __gl_api.DrawBuffers(n, buf);
+      __ogl_framework_api->DrawBuffers(n, buf);
    }
    else {
-      __gl_api.DrawBuffer(mode);
+      __ogl_framework_api->DrawBuffer(mode);
    }
 }
 
 
 void
-glDrawBuffers(GLsizei n, const GLenum * bufs)
+__applegl_glDrawBuffers(GLsizei n, const GLenum * bufs)
 {
-   GLXContext gc = glXGetCurrentContext();
+   struct glx_context * gc = __glXGetCurrentContext();
 
-   if (gc && apple_glx_context_uses_stereo(gc->driContext)) {
+   if (gc != &dummyContext && apple_glx_context_uses_stereo(gc->driContext)) {
       GLenum newbuf[n + 2];
       GLsizei i, outi = 0;
       bool have_back = false;
@@ -114,15 +117,9 @@ glDrawBuffers(GLsizei n, const GLenum * bufs)
          newbuf[outi++] = GL_FRONT_RIGHT;
       }
 
-      __gl_api.DrawBuffers(outi, newbuf);
+      __ogl_framework_api->DrawBuffers(outi, newbuf);
    }
    else {
-      __gl_api.DrawBuffers(n, bufs);
+      __ogl_framework_api->DrawBuffers(n, bufs);
    }
 }
-
-void
-glDrawBuffersARB(GLsizei n, const GLenum * bufs)
-{
-   glDrawBuffers(n, bufs);
-}