Mesa (7.10): apple: Rename GLXcontext

[Jeremy Huddleston]

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

Author: Jeremy Huddleston jerem...@apple.com
Date:   Sun Jun  5 17:22:56 2011 -0400

apple: Rename GLXcontext

Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869

Signed-off-by: Jeremy Huddleston jerem...@apple.com
(cherry picked from commit 22613d1670e3aafcfd3b95191b908a0adabe3eb9)

---

 src/glx/apple/apple_xgl_api_read.c |4 ++--
 src/glx/apple/apple_xgl_api_stereo.c   |4 ++--
 src/glx/apple/apple_xgl_api_viewport.c |2 +-
 src/glx/apple/glx_error.c  |2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/glx/apple/apple_xgl_api_read.c 
b/src/glx/apple/apple_xgl_api_read.c
index 0798f45..45850b9 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 64a15f7..5637dd4 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 e39ab15..e29eba8 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 282f7ae..b3a071c 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);

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Mesa (7.10): apple: Rename GLXcontext

[Jeremy Huddleston]

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

Author: Jeremy Huddleston jerem...@apple.com
Date:   Sun Jun  5 18:22:47 2011 -0400

apple: Rename GLXcontext

Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869

Signed-off-by: Jeremy Huddleston jerem...@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 {

___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit