glx: use __glXQueryServerString
This commit is contained in:
parent
24b8a8cfe8
commit
9c98e35ff6
|
@ -1314,9 +1314,8 @@ PUBLIC const char *glXQueryExtensionsString( Display *dpy, int screen )
|
|||
|
||||
if (!psc->effectiveGLXexts) {
|
||||
if (!psc->serverGLXexts) {
|
||||
psc->serverGLXexts = __glXGetStringFromServer(dpy, priv->majorOpcode,
|
||||
X_GLXQueryServerString,
|
||||
screen, GLX_EXTENSIONS);
|
||||
psc->serverGLXexts =
|
||||
__glXQueryServerString(dpy, screen, GLX_EXTENSIONS);
|
||||
}
|
||||
|
||||
__glXCalculateUsableExtensions(psc,
|
||||
|
@ -1371,8 +1370,7 @@ PUBLIC const char *glXQueryServerString( Display *dpy, int screen, int name )
|
|||
}
|
||||
|
||||
if ( *str == NULL ) {
|
||||
*str = __glXGetStringFromServer(dpy, priv->majorOpcode,
|
||||
X_GLXQueryServerString, screen, name);
|
||||
*str = __glXQueryServerString(dpy, screen, name);
|
||||
}
|
||||
|
||||
return *str;
|
||||
|
|
|
@ -550,9 +550,7 @@ getFBConfigs(Display * dpy, __GLXdisplayPrivate * priv, int screen)
|
|||
__GLXscreenConfigs *psc;
|
||||
|
||||
psc = priv->screenConfigs + screen;
|
||||
psc->serverGLXexts = __glXGetStringFromServer(dpy, priv->majorOpcode,
|
||||
X_GLXQueryServerString,
|
||||
screen, GLX_EXTENSIONS);
|
||||
psc->serverGLXexts = __glXQueryServerString(dpy, screen, GLX_EXTENSIONS);
|
||||
|
||||
LockDisplay(dpy);
|
||||
|
||||
|
@ -610,9 +608,7 @@ AllocAndFetchScreenConfigs(Display * dpy, __GLXdisplayPrivate * priv)
|
|||
memset(psc, 0, screens * sizeof(__GLXscreenConfigs));
|
||||
priv->screenConfigs = psc;
|
||||
|
||||
priv->serverGLXversion = __glXGetStringFromServer(dpy, priv->majorOpcode,
|
||||
X_GLXQueryServerString,
|
||||
0, GLX_VERSION);
|
||||
priv->serverGLXversion = __glXQueryServerString(dpy, 0, GLX_VERSION);
|
||||
if (priv->serverGLXversion == NULL) {
|
||||
FreeScreenConfigs(priv);
|
||||
return GL_FALSE;
|
||||
|
|
Loading…
Reference in New Issue