frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx/dri: Filter out fbconfigs that don't have a supported pixmap format 

For depth 30 in particular it's not uncommon for the DDX to not have
a configured pixmap format. Since the client expects to back both
GLXPixmaps and GLXPbuffers with X Pixmaps, trying to use an x2rgb10
fbconfig would fail along various paths to CreatePixmap. Filter these
fbconfigs out so the client can't ask for something that we know won't
work.

(cherry picked from commit f6c070a1ac)
This commit is contained in:
Adam Jackson 2021-10-26 11:46:37 -04:00 committed by Povilas Kanapickas
parent 66890ca569
commit 001feb6692
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glx/glxdricommon.c
View File

@ -115,6 +115,16 @@ render_type_is_pbuffer_only(unsigned renderType)
| __DRI_ATTRIB_FLOAT_BIT)); | __DRI_ATTRIB_FLOAT_BIT));
} }
static int
server_has_depth(int depth)
{
int i;
for (i = 0; i < screenInfo.numPixmapFormats; i++)
if (screenInfo.formats[i].depth == depth)
return 1;
return 0;
}
static __GLXconfig * static __GLXconfig *
createModeFromConfig(const __DRIcoreExtension * core, createModeFromConfig(const __DRIcoreExtension * core,
const __DRIconfig * driConfig, const __DRIconfig * driConfig,
@ -178,6 +188,16 @@ createModeFromConfig(const __DRIcoreExtension * core,
if (!render_type_is_pbuffer_only(renderType)) if (!render_type_is_pbuffer_only(renderType))
drawableType |= GLX_WINDOW_BIT | GLX_PIXMAP_BIT; drawableType |= GLX_WINDOW_BIT | GLX_PIXMAP_BIT;
/* Make sure we don't advertise things the server isn't configured for */
if ((drawableType & (GLX_PBUFFER_BIT | GLX_PIXMAP_BIT)) &&
!server_has_depth(config->config.rgbBits)) {
drawableType &= ~(GLX_PBUFFER_BIT | GLX_PIXMAP_BIT);
if (!drawableType) {
free(config);
return NULL;
}
}
config->config.next = NULL; config->config.next = NULL;
config->config.visualType = visualType; config->config.visualType = visualType;
config->config.renderType = renderType; config->config.renderType = renderType;