Mesa (master): apple: Rename GLXcontext
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sun Jun 5 22:11:57 UTC 2011
Module: Mesa
Branch: master
Commit: 22613d1670e3aafcfd3b95191b908a0adabe3eb9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=22613d1670e3aafcfd3b95191b908a0adabe3eb9
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Sun Jun 5 17:22:56 2011 -0400
apple: Rename GLXcontext
Fixes regression introduced by: c356f5867f2c1fad7155df538b9affa8dbdcf869
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
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);
More information about the mesa-commit
mailing list