OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/xlib: Fix for recent gl_config changes

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

Fixes: 4daef7ffe3 mesa: Remove redundant gl_config::sampleBuffers
Fixes: 4fbe1cbe4c mesa: Stop tracking visual rating in gl_config
Fixes: d21b8afa3d mesa: Remove the pretense of aux buffer support
Fixes: 78dfab95b8 mesa: Remove unused gl_config::level
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4544
Acked-by: Eric Anholt <eric@anholt.net>
Tested-by: Jan Zielinski <jan.zielinski@intel.com>
Acked-by: Jan Zielinski <jan.zielinski@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10050>
This commit is contained in:
Adam Jackson
2021-04-01 13:44:52 -04:00
committed by Marge Bot
parent 3af12216e3
commit 31dba8d51b
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gallium/frontends/glx/xlib/glx_api.c
View File

@@ -233,8 +233,6 @@ save_glx_visual( Display *dpy, XVisualInfo *vinfo,
for (i=0; i<NumVisuals; i++) { for (i=0; i<NumVisuals; i++) {
XMesaVisual v = VisualTable[i]; XMesaVisual v = VisualTable[i];
if (v->display == dpy if (v->display == dpy
&& v->mesa_visual.level == level
&& v->mesa_visual.numAuxBuffers == numAuxBuffers
&& v->mesa_visual.samples == num_samples && v->mesa_visual.samples == num_samples
&& v->ximage_flag == ximageFlag && v->ximage_flag == ximageFlag
&& v->mesa_visual.doubleBufferMode == dbFlag && v->mesa_visual.doubleBufferMode == dbFlag
@@ -272,10 +270,6 @@ save_glx_visual( Display *dpy, XVisualInfo *vinfo,
/* add xmvis to the list */ /* add xmvis to the list */
VisualTable[NumVisuals] = xmvis; VisualTable[NumVisuals] = xmvis;
NumVisuals++; NumVisuals++;
/* XXX minor hack, because XMesaCreateVisual doesn't support an
* aux buffers parameter.
*/
xmvis->mesa_visual.numAuxBuffers = numAuxBuffers;
} }
return xmvis; return xmvis;
} }
@@ -1485,7 +1479,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig )
*value = xmvis->visinfo->depth; *value = xmvis->visinfo->depth;
return 0; return 0;
case GLX_LEVEL: case GLX_LEVEL:
*value = xmvis->mesa_visual.level; *value = 0;
return 0; return 0;
case GLX_RGBA: case GLX_RGBA:
if (fbconfig) if (fbconfig)
@@ -1499,7 +1493,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig )
*value = (int) xmvis->mesa_visual.stereoMode; *value = (int) xmvis->mesa_visual.stereoMode;
return 0; return 0;
case GLX_AUX_BUFFERS: case GLX_AUX_BUFFERS:
*value = xmvis->mesa_visual.numAuxBuffers; *value = 0;
return 0; return 0;
case GLX_RED_SIZE: case GLX_RED_SIZE:
*value = xmvis->mesa_visual.redBits; *value = xmvis->mesa_visual.redBits;
@@ -1569,18 +1563,14 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig )
* GLX_EXT_visual_info extension * GLX_EXT_visual_info extension
*/ */
case GLX_VISUAL_CAVEAT_EXT: case GLX_VISUAL_CAVEAT_EXT:
/* test for zero, just in case */ *value = GLX_NONE_EXT;
if (xmvis->mesa_visual.visualRating > 0)
*value = xmvis->mesa_visual.visualRating;
else
*value = GLX_NONE_EXT;
return 0; return 0;
/* /*
* GLX_ARB_multisample * GLX_ARB_multisample
*/ */
case GLX_SAMPLE_BUFFERS_ARB: case GLX_SAMPLE_BUFFERS_ARB:
*value = xmvis->mesa_visual.sampleBuffers; *value = xmvis->mesa_visual.samples > 0;
return 0; return 0;
case GLX_SAMPLES_ARB: case GLX_SAMPLES_ARB:
*value = xmvis->mesa_visual.samples; *value = xmvis->mesa_visual.samples;

8
src/gallium/frontends/glx/xlib/xm_api.c
View File

@@ -675,7 +675,6 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b,
*/ */
if (getenv("MESA_INFO")) { if (getenv("MESA_INFO")) {
printf("X/Mesa visual = %p\n", (void *) v); 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 depth = %d\n", v->visinfo->depth);
printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel); 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); v->visualType = xmesa_convert_from_x_visual_type(visinfo->c_class);
#endif #endif
v->mesa_visual.visualRating = visualCaveat;
if (alpha_flag) if (alpha_flag)
v->mesa_visual.alphaBits = 8; v->mesa_visual.alphaBits = 8;
@@ -860,9 +857,6 @@ XMesaVisual XMesaCreateVisual( Display *display,
vis->accumBlueBits = accum_blue_size; vis->accumBlueBits = accum_blue_size;
vis->accumAlphaBits = accum_alpha_size; vis->accumAlphaBits = accum_alpha_size;
vis->numAuxBuffers = 0;
vis->level = 0;
vis->sampleBuffers = num_samples > 1;
vis->samples = num_samples; vis->samples = num_samples;
} }
@@ -902,8 +896,6 @@ XMesaVisual XMesaCreateVisual( Display *display,
v->stvis.samples = num_samples; v->stvis.samples = num_samples;
v->stvis.render_buffer = ST_ATTACHMENT_INVALID; v->stvis.render_buffer = ST_ATTACHMENT_INVALID;
/* XXX minor hack */
v->mesa_visual.level = level;
return v; return v;
} }