From 1f096b51c6576b95df7ef8d69597388652c4da23 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 22 Apr 2021 18:39:41 -0400
Subject: [PATCH] glx: Remove unused opcode argument to
 __glX{Get,QueryServer}String

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10418>
---
 src/glx/glx_query.c | 4 ++--
 src/glx/glxclient.h | 6 ++----
 src/glx/glxcmds.c   | 5 ++---
 src/glx/glxext.c    | 6 ++----
 src/glx/single2.c   | 3 +--
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/glx/glx_query.c b/src/glx/glx_query.c
index 14e6f7c1c48..ce563ef8697 100644
--- a/src/glx/glx_query.c
+++ b/src/glx/glx_query.c
@@ -40,7 +40,7 @@
  * Exchange a protocol request for glXQueryServerString.
  */
 char *
-__glXQueryServerString(Display * dpy, int opcode, CARD32 screen, CARD32 name)
+__glXQueryServerString(Display * dpy, CARD32 screen, CARD32 name)
 {
    xcb_connection_t *c = XGetXCBConnection(dpy);
    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.
  */
 char *
-__glXGetString(Display * dpy, int opcode, CARD32 contextTag, CARD32 name)
+__glXGetString(Display * dpy, CARD32 contextTag, CARD32 name)
 {
    xcb_connection_t *c = XGetXCBConnection(dpy);
    xcb_glx_get_string_reply_t *reply = xcb_glx_get_string_reply(c,
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 78fe46e53af..045eaebe65e 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -771,10 +771,8 @@ extern void __glXInitializeVisualConfigFromTags(struct glx_config * config,
                                                 Bool tagged_only,
                                                 Bool fbconfig_style_tags);
 
-extern char *__glXQueryServerString(Display * dpy, int opcode,
-                                    CARD32 screen, CARD32 name);
-extern char *__glXGetString(Display * dpy, int opcode,
-                            CARD32 screen, CARD32 name);
+extern char *__glXQueryServerString(Display *dpy, CARD32 screen, CARD32 name);
+extern char *__glXGetString(Display *dpy, CARD32 screen, CARD32 name);
 
 extern const char __glXGLClientVersion[];
 extern const char __glXGLClientExtensions[];
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index ac2786ececa..8aeb685ee30 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1323,8 +1323,7 @@ glXQueryExtensionsString(Display * dpy, int screen)
    if (!psc->effectiveGLXexts) {
       if (!psc->serverGLXexts) {
          psc->serverGLXexts =
-            __glXQueryServerString(dpy, priv->majorOpcode, screen,
-                                   GLX_EXTENSIONS);
+            __glXQueryServerString(dpy, screen, GLX_EXTENSIONS);
       }
 
 #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
@@ -1380,7 +1379,7 @@ glXQueryServerString(Display * dpy, int screen, int name)
    }
 
    if (*str == NULL) {
-      *str = __glXQueryServerString(dpy, priv->majorOpcode, screen, name);
+      *str = __glXQueryServerString(dpy, screen, name);
    }
 
    return *str;
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 548982436c6..120a09ddef5 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -728,8 +728,7 @@ getFBConfigs(struct glx_screen *psc, struct glx_display *priv, int screen)
    xGLXGetFBConfigsReply reply;
    Display *dpy = priv->dpy;
 
-   psc->serverGLXexts =
-      __glXQueryServerString(dpy, priv->majorOpcode, screen, GLX_EXTENSIONS);
+   psc->serverGLXexts = __glXQueryServerString(dpy, screen, GLX_EXTENSIONS);
 
    if (psc->serverGLXexts == NULL) {
       return GL_FALSE;
@@ -822,8 +821,7 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv)
    if (!priv->screens)
       return GL_FALSE;
 
-   priv->serverGLXversion =
-      __glXQueryServerString(dpy, priv->majorOpcode, 0, GLX_VERSION);
+   priv->serverGLXversion = __glXQueryServerString(dpy, 0, GLX_VERSION);
    if (priv->serverGLXversion == NULL) {
       FreeScreenConfigs(priv);
       return GL_FALSE;
diff --git a/src/glx/single2.c b/src/glx/single2.c
index f23a207a37a..1ed8c0cd2f3 100644
--- a/src/glx/single2.c
+++ b/src/glx/single2.c
@@ -679,8 +679,7 @@ __indirect_glGetString(GLenum name)
     */
 
    (void) __glXFlushRenderBuffer(gc, gc->pc);
-   s = (GLubyte *) __glXGetString(dpy, gc->majorOpcode, gc->currentContextTag,
-                                  name);
+   s = (GLubyte *) __glXGetString(dpy, gc->currentContextTag, name);
    if (!s) {
       /* Throw data on the floor */
       __glXSetError(gc, GL_OUT_OF_MEMORY);