KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glx: Remove unused opcode argument to __glX{Get,QueryServer}String 

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10418>
This commit is contained in:
Adam Jackson 2021-04-22 18:39:41 -04:00 committed by Marge Bot
parent 8f853135e6
commit 1f096b51c6
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/glx/glx_query.c
View File

@ -40,7 +40,7 @@
* Exchange a protocol request for glXQueryServerString. * Exchange a protocol request for glXQueryServerString.
*/ */
char * char *
__glXQueryServerString(Display * dpy, int opcode, CARD32 screen, CARD32 name) __glXQueryServerString(Display * dpy, CARD32 screen, CARD32 name)
{ {
xcb_connection_t *c = XGetXCBConnection(dpy); xcb_connection_t *c = XGetXCBConnection(dpy);
xcb_glx_query_server_string_reply_t *reply = xcb_glx_query_server_string_reply_t *reply =
@ -67,7 +67,7 @@ __glXQueryServerString(Display * dpy, int opcode, CARD32 screen, CARD32 name)
* Exchange a protocol request for glGetString. * Exchange a protocol request for glGetString.
*/ */
char * char *
__glXGetString(Display * dpy, int opcode, CARD32 contextTag, CARD32 name) __glXGetString(Display * dpy, CARD32 contextTag, CARD32 name)
{ {
xcb_connection_t *c = XGetXCBConnection(dpy); xcb_connection_t *c = XGetXCBConnection(dpy);
xcb_glx_get_string_reply_t *reply = xcb_glx_get_string_reply(c, xcb_glx_get_string_reply_t *reply = xcb_glx_get_string_reply(c,

6
src/glx/glxclient.h
View File

@ -771,10 +771,8 @@ extern void __glXInitializeVisualConfigFromTags(struct glx_config * config,
Bool tagged_only, Bool tagged_only,
Bool fbconfig_style_tags); Bool fbconfig_style_tags);
extern char *__glXQueryServerString(Display * dpy, int opcode, extern char *__glXQueryServerString(Display *dpy, CARD32 screen, CARD32 name);
CARD32 screen, CARD32 name); extern char *__glXGetString(Display *dpy, CARD32 screen, CARD32 name);
extern char *__glXGetString(Display * dpy, int opcode,
CARD32 screen, CARD32 name);
extern const char __glXGLClientVersion[]; extern const char __glXGLClientVersion[];
extern const char __glXGLClientExtensions[]; extern const char __glXGLClientExtensions[];

5
src/glx/glxcmds.c
View File

@ -1323,8 +1323,7 @@ glXQueryExtensionsString(Display * dpy, int screen)
if (!psc->effectiveGLXexts) { if (!psc->effectiveGLXexts) {
if (!psc->serverGLXexts) { if (!psc->serverGLXexts) {
psc->serverGLXexts = psc->serverGLXexts =
__glXQueryServerString(dpy, priv->majorOpcode, screen, __glXQueryServerString(dpy, screen, GLX_EXTENSIONS);
GLX_EXTENSIONS);
} }
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
@ -1380,7 +1379,7 @@ glXQueryServerString(Display * dpy, int screen, int name)
} }
if (*str == NULL) { if (*str == NULL) {
*str = __glXQueryServerString(dpy, priv->majorOpcode, screen, name); *str = __glXQueryServerString(dpy, screen, name);
} }
return *str; return *str;

6
src/glx/glxext.c
View File

@ -728,8 +728,7 @@ getFBConfigs(struct glx_screen *psc, struct glx_display *priv, int screen)
xGLXGetFBConfigsReply reply; xGLXGetFBConfigsReply reply;
Display *dpy = priv->dpy; Display *dpy = priv->dpy;
psc->serverGLXexts = psc->serverGLXexts = __glXQueryServerString(dpy, screen, GLX_EXTENSIONS);
__glXQueryServerString(dpy, priv->majorOpcode, screen, GLX_EXTENSIONS);
if (psc->serverGLXexts == NULL) { if (psc->serverGLXexts == NULL) {
return GL_FALSE; return GL_FALSE;
@ -822,8 +821,7 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv)
if (!priv->screens) if (!priv->screens)
return GL_FALSE; return GL_FALSE;
priv->serverGLXversion = priv->serverGLXversion = __glXQueryServerString(dpy, 0, GLX_VERSION);
__glXQueryServerString(dpy, priv->majorOpcode, 0, GLX_VERSION);
if (priv->serverGLXversion == NULL) { if (priv->serverGLXversion == NULL) {
FreeScreenConfigs(priv); FreeScreenConfigs(priv);
return GL_FALSE; return GL_FALSE;

3
src/glx/single2.c
View File

@ -679,8 +679,7 @@ __indirect_glGetString(GLenum name)
*/ */
(void) __glXFlushRenderBuffer(gc, gc->pc); (void) __glXFlushRenderBuffer(gc, gc->pc);
s = (GLubyte *) __glXGetString(dpy, gc->majorOpcode, gc->currentContextTag, s = (GLubyte *) __glXGetString(dpy, gc->currentContextTag, name);
name);
if (!s) { if (!s) {
/* Throw data on the floor */ /* Throw data on the floor */
__glXSetError(gc, GL_OUT_OF_MEMORY); __glXSetError(gc, GL_OUT_OF_MEMORY);