glx: Stash a copy of the XExtCodes in the glx_display

Instead of a pointer into xlib's state for it. Mostly because it lets us
remove our copy of majorOpcode from the display without taking another
pointer indirection.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10418>

src/glx/dri2_glx.c

@@ -716,7 +716,7 @@ unsigned dri2GetSwapEventType(Display* dpy, XID drawable)
       pdraw = dri2GetGlxDrawableFromXDrawableId(dpy, drawable);
       if (!pdraw || !(pdraw->eventMask & GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK))
          return 0;
-      return glx_dpy->codes->first_event + GLX_BufferSwapComplete;
+      return glx_dpy->codes.first_event + GLX_BufferSwapComplete;
 }
 
 static void show_fps(struct dri2_drawable *draw)

src/glx/glx_error.c

@@ -51,13 +51,13 @@ __glXSendError(Display * dpy, int_fast8_t errorCode, uint_fast32_t resourceID,
       error.errorCode = errorCode;
    }
    else {
-      error.errorCode = glx_dpy->codes->first_error + errorCode;
+      error.errorCode = glx_dpy->codes.first_error + errorCode;
    }
 
    error.sequenceNumber = dpy->request;
    error.resourceID = resourceID;
    error.minorCode = minorCode;
-   error.majorCode = glx_dpy->majorOpcode;
+   error.majorCode = glx_dpy->codes.major_opcode;
 
    _XError(dpy, &error);
 

src/glx/glxclient.h

@@ -558,21 +558,16 @@ struct glx_screen
  */
 struct glx_display
 {
-   /* The extension protocol codes */
-   XExtCodes *codes;
    struct glx_display *next;
 
+   /* The extension protocol codes */
+   XExtCodes codes;
+
     /**
      * Back pointer to the display
      */
    Display *dpy;
 
-    /**
-     * The \c majorOpcode is common to all connections to the same server.
-     * It is also copied into the context structure.
-     */
-   int majorOpcode;
-
     /**
      * \name Minor Version
      *

src/glx/glxext.c

@@ -150,7 +150,7 @@ __glXWireToEvent(Display *dpy, XEvent *event, xEvent *wire)
    if (glx_dpy == NULL)
       return False;
 
-   switch ((wire->u.u.type & 0x7f) - glx_dpy->codes->first_event) {
+   switch ((wire->u.u.type & 0x7f) - glx_dpy->codes.first_event) {
    case GLX_PbufferClobber:
    {
       GLXPbufferClobberEvent *aevent = (GLXPbufferClobberEvent *)event;
@@ -702,7 +702,7 @@ getVisualConfigs(struct glx_screen *psc,
 
    psc->visuals = NULL;
    GetReq(GLXGetVisualConfigs, req);
-   req->reqType = priv->majorOpcode;
+   req->reqType = priv->codes.major_opcode;
    req->glxCode = X_GLXGetVisualConfigs;
    req->screen = screen;
 
@@ -739,7 +739,7 @@ getFBConfigs(struct glx_screen *psc, struct glx_display *priv, int screen)
    psc->configs = NULL;
    if (priv->minorVersion >= 3) {
       GetReq(GLXGetFBConfigs, fb_req);
-      fb_req->reqType = priv->majorOpcode;
+      fb_req->reqType = priv->codes.major_opcode;
       fb_req->glxCode = X_GLXGetFBConfigs;
       fb_req->screen = screen;
    }
@@ -748,7 +748,7 @@ getFBConfigs(struct glx_screen *psc, struct glx_display *priv, int screen)
                   sz_xGLXGetFBConfigsSGIXReq -
                   sz_xGLXVendorPrivateWithReplyReq, vpreq);
       sgi_req = (xGLXGetFBConfigsSGIXReq *) vpreq;
-      sgi_req->reqType = priv->majorOpcode;
+      sgi_req->reqType = priv->codes.major_opcode;
       sgi_req->glxCode = X_GLXVendorPrivateWithReply;
       sgi_req->vendorCode = X_GLXvop_GetFBConfigsSGIX;
       sgi_req->screen = screen;
@@ -889,21 +889,16 @@ __glXInitialize(Display * dpy)
    if (!dpyPriv)
       return NULL;
 
-   dpyPriv->codes = XInitExtension(dpy, __glXExtensionName);
-   if (!dpyPriv->codes) {
-      free(dpyPriv);
-      return NULL;
-   }
+   dpyPriv->codes = *XInitExtension(dpy, __glXExtensionName);
 
    dpyPriv->dpy = dpy;
-   dpyPriv->majorOpcode = dpyPriv->codes->major_opcode;
    dpyPriv->serverGLXvendor = 0x0;
    dpyPriv->serverGLXversion = 0x0;
 
    /* This GLX implementation requires X_GLXQueryExtensionsString
     * and X_GLXQueryServerString, which are new in GLX 1.1.
     */
-   if (!QueryVersion(dpy, dpyPriv->majorOpcode,
+   if (!QueryVersion(dpy, dpyPriv->codes.major_opcode,
 		     &majorVersion, &dpyPriv->minorVersion)
        || (majorVersion != 1)
        || (majorVersion == 1 && dpyPriv->minorVersion < 1)) {
@@ -912,12 +907,12 @@ __glXInitialize(Display * dpy)
    }
 
    for (i = 0; i < __GLX_NUMBER_EVENTS; i++) {
-      XESetWireToEvent(dpy, dpyPriv->codes->first_event + i, __glXWireToEvent);
-      XESetEventToWire(dpy, dpyPriv->codes->first_event + i, __glXEventToWire);
+      XESetWireToEvent(dpy, dpyPriv->codes.first_event + i, __glXWireToEvent);
+      XESetEventToWire(dpy, dpyPriv->codes.first_event + i, __glXEventToWire);
    }
 
-   XESetCloseDisplay(dpy, dpyPriv->codes->extension, __glXCloseDisplay);
-   XESetErrorString (dpy, dpyPriv->codes->extension, __glXErrorString);
+   XESetCloseDisplay(dpy, dpyPriv->codes.extension, __glXCloseDisplay);
+   XESetErrorString (dpy, dpyPriv->codes.extension, __glXErrorString);
 
    dpyPriv->glXDrawHash = __glxHashCreate();
 
@@ -1023,7 +1018,7 @@ __glXSetupForCommand(Display * dpy)
    if (!priv) {
       return 0;
    }
-   return priv->majorOpcode;
+   return priv->codes.major_opcode;
 }
 
 /**

src/glx/tests/clientinfo_unittest.cpp

@@ -42,7 +42,6 @@ public:
    {
       this->next = 0;
       this->dpy = dpy;
-      this->majorOpcode = 0;
       this->minorVersion = minor;
       this->serverGLXvendor = 0;
       this->serverGLXversion = 0;