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

glx: Pass screen number as parameter to CreateContext

Browse source 
Passing the screen parameter to CreateContext will simplify a couple
of changes that are coming.
This commit is contained in:
Ian Romanick 2010-02-04 16:37:59 -08:00
parent 8bffadbc83
commit 7bcfb66000
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/glx/glxcmds.c
View file

@ -366,12 +366,13 @@ CreateContext(Display * dpy, XVisualInfo * vis,
const __GLcontextModes * const fbconfig,
GLXContext shareList,
Bool allowDirect, GLXContextID contextID,
unsigned code, int renderType)
unsigned code, int renderType, int screen)
{
GLXContext gc;
#ifdef GLX_DIRECT_RENDERING
int screen = (fbconfig == NULL) ? vis->screen : fbconfig->screen;
__GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen);
#else
(void) screen;
#endif
if (dpy == NULL)
@ -504,7 +505,7 @@ glXCreateContext(Display * dpy, XVisualInfo * vis,
GLXContext shareList, Bool allowDirect)
{
return CreateContext(dpy, vis, NULL, shareList, allowDirect, None,
X_GLXCreateContext, 0);
X_GLXCreateContext, 0, vis->screen);
}
_X_HIDDEN void
@ -1753,8 +1754,11 @@ glXImportContextEXT(Display * dpy, GLXContextID contextID)
return NULL;
}
/* FIXME: Why does this call CreateContext? There is no protocol sent for
* FIXME: this function.
*/
ctx = CreateContext(dpy, NULL, NULL, NULL, False, contextID,
X_GLXCreateContext, 0);
X_GLXCreateContext, 0, 0);
if (NULL != ctx) {
if (Success != __glXQueryContextInfo(dpy, ctx)) {
return NULL;
@ -1803,8 +1807,12 @@ PUBLIC GLXContext
glXCreateNewContext(Display * dpy, GLXFBConfig config,
int renderType, GLXContext shareList, Bool allowDirect)
{
return CreateContext(dpy, NULL, (__GLcontextModes *) config, shareList,
allowDirect, None, X_GLXCreateNewContext, renderType);
const __GLcontextModes *const fbconfig =
(const __GLcontextModes *const) config;
return CreateContext(dpy, NULL, fbconfig, shareList,
allowDirect, None, X_GLXCreateNewContext, renderType,
fbconfig->screen);
}
@ -2293,7 +2301,8 @@ glXCreateContextWithConfigSGIX(Display * dpy,
&& __glXExtensionBitIsEnabled(psc, SGIX_fbconfig_bit)) {
gc = CreateContext(dpy, NULL, (__GLcontextModes *) config, shareList,
allowDirect, None,
X_GLXvop_CreateContextWithConfigSGIX, renderType);
X_GLXvop_CreateContextWithConfigSGIX, renderType,
fbconfig->screen);
}
return gc;