summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-02-04 17:01:42 -0800
committerIan Romanick <ian.d.romanick@intel.com>2010-02-11 15:40:29 -0800
commitc3db1d621e1f7c73006ed76855d31b1034bc3aef (patch)
tree746b28c0725dc46872e76f08391cf65853af4b43
parent52cf8db428909156b062f17a9e6251a38178dec3 (diff)
glx: Use the screen parameter everywhere instead of vis->screen, etc.
-rw-r--r--src/glx/glxcmds.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 1be6ff3979..9b4a6da065 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);