fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 14:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

apple: Rename GLXcontext

Browse source 
Fixes regression introduced by: c356f5867f

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2011-06-05 17:22:56 -04:00
parent bb621cb61e
commit 22613d1670
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glx/apple/apple_xgl_api_read.c
View file

@ -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,

4
src/glx/apple/apple_xgl_api_stereo.c
View file

@ -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];

2
src/glx/apple/apple_xgl_api_viewport.c
View file

@ -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)

2
src/glx/apple/glx_error.c
View file

@ -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);