Mesa (7.10): apple: Rename GLXcontext

Jeremy Huddleston jeremyhu at kemper.freedesktop.org
Mon Jun 6 16:13:28 UTC 2011


Module: Mesa
Branch: 7.10
Commit: 160552511184ff4c89a96a1f799f044ea3ad1006
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=160552511184ff4c89a96a1f799f044ea3ad1006

Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Jun  5 18:22:47 2011 -0400

apple: Rename GLXcontext

Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
(cherry picked from commit 279e471750e3ee6a4841ebf16ef2d038e1c12077)

---

 src/glx/glxcmds.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index f26ba1d..0d41fe0 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -710,7 +710,7 @@ _X_EXPORT void
 glXSwapBuffers(Display * dpy, GLXDrawable drawable)
 {
 #ifdef GLX_USE_APPLEGL
-   GLXContext gc = glXGetCurrentContext();
+   struct glx_context * gc = __glXGetCurrentContext();
    if(gc && apple_glx_is_current_drawable(dpy, gc->driContext, drawable)) {
       apple_glx_swap_buffers(gc->driContext);
    } else {




More information about the mesa-commit mailing list