Mesa (master): gallium/xlib: Fix for recent gl_config changes

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 31dba8d51b08ef160537c37d381b304c09091ee3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=31dba8d51b08ef160537c37d381b304c09091ee3

Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Apr  1 13:44:52 2021 -0400

gallium/xlib: Fix for recent gl_config changes

This mirrors the changes needed elsewhere for parts of !9817:

Fixes: 4daef7ffe37 mesa: Remove redundant gl_config::sampleBuffers
Fixes: 4fbe1cbe4cc mesa: Stop tracking visual rating in gl_config
Fixes: d21b8afa3de mesa: Remove the pretense of aux buffer support
Fixes: 78dfab95b80 mesa: Remove unused gl_config::level
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4544
Acked-by: Eric Anholt <eric at anholt.net>
Tested-by: Jan Zielinski <jan.zielinski at intel.com>
Acked-by: Jan Zielinski <jan.zielinski at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10050>

---

 src/gallium/frontends/glx/xlib/glx_api.c | 18 ++++--------------
 src/gallium/frontends/glx/xlib/xm_api.c  |  8 --------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/gallium/frontends/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c
index 281111bdfb0..c0b172a6751 100644
--- a/src/gallium/frontends/glx/xlib/glx_api.c
+++ b/src/gallium/frontends/glx/xlib/glx_api.c
@@ -233,8 +233,6 @@ save_glx_visual( Display *dpy, XVisualInfo *vinfo,
    for (i=0; i<NumVisuals; i++) {
       XMesaVisual v = VisualTable[i];
       if (v->display == dpy
-          && v->mesa_visual.level == level
-          && v->mesa_visual.numAuxBuffers == numAuxBuffers
           && v->mesa_visual.samples == num_samples
           && v->ximage_flag == ximageFlag
           && v->mesa_visual.doubleBufferMode == dbFlag
@@ -272,10 +270,6 @@ save_glx_visual( Display *dpy, XVisualInfo *vinfo,
       /* add xmvis to the list */
       VisualTable[NumVisuals] = xmvis;
       NumVisuals++;
-      /* XXX minor hack, because XMesaCreateVisual doesn't support an
-       * aux buffers parameter.
-       */
-      xmvis->mesa_visual.numAuxBuffers = numAuxBuffers;
    }
    return xmvis;
 }
@@ -1485,7 +1479,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig )
 	 *value = xmvis->visinfo->depth;
 	 return 0;
       case GLX_LEVEL:
-	 *value = xmvis->mesa_visual.level;
+	 *value = 0;
 	 return 0;
       case GLX_RGBA:
          if (fbconfig)
@@ -1499,7 +1493,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig )
 	 *value = (int) xmvis->mesa_visual.stereoMode;
 	 return 0;
       case GLX_AUX_BUFFERS:
-	 *value = xmvis->mesa_visual.numAuxBuffers;
+	 *value = 0;
 	 return 0;
       case GLX_RED_SIZE:
          *value = xmvis->mesa_visual.redBits;
@@ -1569,18 +1563,14 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig )
        * GLX_EXT_visual_info extension
        */
       case GLX_VISUAL_CAVEAT_EXT:
-         /* test for zero, just in case */
-         if (xmvis->mesa_visual.visualRating > 0)
-            *value = xmvis->mesa_visual.visualRating;
-         else
-            *value = GLX_NONE_EXT;
+         *value = GLX_NONE_EXT;
          return 0;
 
       /*
        * GLX_ARB_multisample
        */
       case GLX_SAMPLE_BUFFERS_ARB:
-         *value = xmvis->mesa_visual.sampleBuffers;
+         *value = xmvis->mesa_visual.samples > 0;
          return 0;
       case GLX_SAMPLES_ARB:
          *value = xmvis->mesa_visual.samples;
diff --git a/src/gallium/frontends/glx/xlib/xm_api.c b/src/gallium/frontends/glx/xlib/xm_api.c
index c54acdda4db..63b7d9c29cc 100644
--- a/src/gallium/frontends/glx/xlib/xm_api.c
+++ b/src/gallium/frontends/glx/xlib/xm_api.c
@@ -675,7 +675,6 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b,
     */
    if (getenv("MESA_INFO")) {
       printf("X/Mesa visual = %p\n", (void *) v);
-      printf("X/Mesa level = %d\n", v->mesa_visual.level);
       printf("X/Mesa depth = %d\n", v->visinfo->depth);
       printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
    }
@@ -810,8 +809,6 @@ XMesaVisual XMesaCreateVisual( Display *display,
    v->visualType = xmesa_convert_from_x_visual_type(visinfo->c_class);
 #endif
 
-   v->mesa_visual.visualRating = visualCaveat;
-
    if (alpha_flag)
       v->mesa_visual.alphaBits = 8;
 
@@ -860,9 +857,6 @@ XMesaVisual XMesaCreateVisual( Display *display,
       vis->accumBlueBits  = accum_blue_size;
       vis->accumAlphaBits = accum_alpha_size;
 
-      vis->numAuxBuffers = 0;
-      vis->level = 0;
-      vis->sampleBuffers = num_samples > 1;
       vis->samples = num_samples;
    }
 
@@ -902,8 +896,6 @@ XMesaVisual XMesaCreateVisual( Display *display,
    v->stvis.samples = num_samples;
    v->stvis.render_buffer = ST_ATTACHMENT_INVALID;
 
-   /* XXX minor hack */
-   v->mesa_visual.level = level;
    return v;
 }