Mesa (master): glx: Use the screen parameter everywhere instead of vis-> screen, etc.
Ian Romanick
idr at kemper.freedesktop.org
Wed Feb 17 19:44:24 UTC 2010
Module: Mesa
Branch: master
Commit: c3db1d621e1f7c73006ed76855d31b1034bc3aef
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3db1d621e1f7c73006ed76855d31b1034bc3aef
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Feb 4 17:01:42 2010 -0800
glx: Use the screen parameter everywhere instead of vis->screen, etc.
---
src/glx/glxcmds.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 1be6ff3..9b4a6da 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -371,8 +371,6 @@ CreateContext(Display * dpy, XVisualInfo * vis,
GLXContext gc;
#ifdef GLX_DIRECT_RENDERING
__GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen);
-#else
- (void) screen;
#endif
if (dpy == NULL)
@@ -409,7 +407,7 @@ CreateContext(Display * dpy, XVisualInfo * vis,
req->glxCode = X_GLXCreateContext;
req->context = gc->xid = XAllocID(dpy);
req->visual = vis->visualid;
- req->screen = vis->screen;
+ req->screen = screen;
req->shareList = shareList ? shareList->xid : None;
req->isDirect = GC_IS_DIRECT(gc);
break;
@@ -424,7 +422,7 @@ CreateContext(Display * dpy, XVisualInfo * vis,
req->glxCode = X_GLXCreateNewContext;
req->context = gc->xid = XAllocID(dpy);
req->fbconfig = fbconfig->fbconfigID;
- req->screen = fbconfig->screen;
+ req->screen = screen;
req->renderType = renderType;
req->shareList = shareList ? shareList->xid : None;
req->isDirect = GC_IS_DIRECT(gc);
@@ -445,7 +443,7 @@ CreateContext(Display * dpy, XVisualInfo * vis,
req->vendorCode = X_GLXvop_CreateContextWithConfigSGIX;
req->context = gc->xid = XAllocID(dpy);
req->fbconfig = fbconfig->fbconfigID;
- req->screen = fbconfig->screen;
+ req->screen = screen;
req->renderType = renderType;
req->shareList = shareList ? shareList->xid : None;
req->isDirect = GC_IS_DIRECT(gc);
More information about the mesa-commit
mailing list