glx/dri2: Stop tracking the protocol version in the display state
authorAdam Jackson <ajax@redhat.com>
Wed, 6 Jul 2022 14:22:39 +0000 (10:22 -0400)
committerMarge Bot <emma+marge@anholt.net>
Tue, 12 Jul 2022 18:43:24 +0000 (18:43 +0000)
We only use it at init time, no need to keep it around.

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

src/glx/dri2_glx.c

index 5624e24..e75ee2b 100644 (file)
@@ -63,13 +63,6 @@ struct dri2_display
 {
    __GLXDRIdisplay base;
 
-   /*
-    ** XFree86-DRI version information
-    */
-   int driMajor;
-   int driMinor;
-   int driPatch;
-
    __glxHashTable *dri2Hash;
 
    const __DRIextension *loader_extensions[5];
@@ -1321,6 +1314,7 @@ dri2CreateDisplay(Display * dpy)
 {
    struct dri2_display *pdp;
    int eventBase, errorBase, i;
+   int driMajor, driMinor;
 
    if (!DRI2QueryExtension(dpy, &eventBase, &errorBase))
       return NULL;
@@ -1329,18 +1323,12 @@ dri2CreateDisplay(Display * dpy)
    if (pdp == NULL)
       return NULL;
 
-   if (!DRI2QueryVersion(dpy, &pdp->driMajor, &pdp->driMinor)) {
-      free(pdp);
-      return NULL;
-   }
-
-   if (pdp->driMinor < 3) {
+   if (!DRI2QueryVersion(dpy, &driMajor, &driMinor) ||
+       driMinor < 3) {
       free(pdp);
       return NULL;
    }
 
-   pdp->driPatch = 0;
-
    pdp->base.destroyDisplay = dri2DestroyDisplay;
    pdp->base.createScreen = dri2CreateScreen;