From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun, 5 Jun 2011 21:22:56 +0000 (-0400)
Subject: apple: Rename GLXcontext
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22613d1670e3aafcfd3b95191b908a0adabe3eb9;p=mesa.git

apple: Rename GLXcontext

Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---

diff --git a/src/glx/apple/apple_xgl_api_read.c b/src/glx/apple/apple_xgl_api_read.c
index 0798f45bbfb..45850b97088 100644
--- a/src/glx/apple/apple_xgl_api_read.c
+++ b/src/glx/apple/apple_xgl_api_read.c
@@ -48,7 +48,7 @@ struct apple_xgl_saved_state
 static void
 SetRead(struct apple_xgl_saved_state *saved)
 {
-   GLXContext gc = __glXGetCurrentContext();
+   struct glx_context *gc = __glXGetCurrentContext();
 
    /*
     * By default indicate that the state was not swapped, so that UnsetRead
@@ -81,7 +81,7 @@ static void
 UnsetRead(struct apple_xgl_saved_state *saved)
 {
    if (saved->swapped) {
-      GLXContext gc = __glXGetCurrentContext();
+      struct glx_context *gc = __glXGetCurrentContext();
       Display *dpy = glXGetCurrentDisplay();
 
       if (apple_glx_make_current_context(dpy, gc->driContext, gc->driContext,
diff --git a/src/glx/apple/apple_xgl_api_stereo.c b/src/glx/apple/apple_xgl_api_stereo.c
index 64a15f74861..5637dd4c627 100644
--- a/src/glx/apple/apple_xgl_api_stereo.c
+++ b/src/glx/apple/apple_xgl_api_stereo.c
@@ -49,7 +49,7 @@ extern struct apple_xgl_api __gl_api;
 void
 glDrawBuffer(GLenum mode)
 {
-   GLXContext gc = glXGetCurrentContext();
+   struct glx_context * gc = __glXGetCurrentContext();
 
    if (gc && apple_glx_context_uses_stereo(gc->driContext)) {
       GLenum buf[2];
@@ -84,7 +84,7 @@ glDrawBuffer(GLenum mode)
 void
 glDrawBuffers(GLsizei n, const GLenum * bufs)
 {
-   GLXContext gc = glXGetCurrentContext();
+   struct glx_context * gc = __glXGetCurrentContext();
 
    if (gc && apple_glx_context_uses_stereo(gc->driContext)) {
       GLenum newbuf[n + 2];
diff --git a/src/glx/apple/apple_xgl_api_viewport.c b/src/glx/apple/apple_xgl_api_viewport.c
index e39ab152235..e29eba82534 100644
--- a/src/glx/apple/apple_xgl_api_viewport.c
+++ b/src/glx/apple/apple_xgl_api_viewport.c
@@ -36,7 +36,7 @@ extern struct apple_xgl_api __gl_api;
 void
 glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   GLXContext gc = __glXGetCurrentContext();
+   struct glx_context *gc = __glXGetCurrentContext();
    Display *dpy = glXGetCurrentDisplay();
 
    if (gc && gc->driContext)
diff --git a/src/glx/apple/glx_error.c b/src/glx/apple/glx_error.c
index 282f7ae40b1..b3a071c307b 100644
--- a/src/glx/apple/glx_error.c
+++ b/src/glx/apple/glx_error.c
@@ -40,7 +40,7 @@ __glXSendError(Display * dpy, int errorCode, unsigned long resourceID,
                unsigned long minorCode, bool coreX11error)
 {
    XExtDisplayInfo *info = __glXFindDisplay(dpy);
-   GLXContext gc = __glXGetCurrentContext();
+   struct glx_context *gc = __glXGetCurrentContext();
    xError error;
 
    LockDisplay(dpy);