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

glamor: reject configs using unsupported rgbBits size 

The supported color depths is a hardcoded list for now, so we
need to honor the value exposed there otherwise we'll get
inconsistencies between what glXGetFBConfigs and XListDepths
report to applications.

Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1764>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2025-01-16 10:08:15 +01:00 committed by Marge Bot
parent 83b13387ab
commit 5397854877
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
glamor/glamor_glx_provider.c
View File

@ -140,12 +140,14 @@ egl_create_glx_drawable(ClientPtr client, __GLXscreen *screen,
* - drawable type masks is suspicious * - drawable type masks is suspicious
*/ */
static struct egl_config * static struct egl_config *
translate_eglconfig(struct egl_screen *screen, EGLConfig hc, translate_eglconfig(ScreenPtr pScreen, struct egl_screen *screen, EGLConfig hc,
struct egl_config *chain, Bool direct_color, struct egl_config *chain, Bool direct_color,
Bool double_buffer, Bool duplicate_for_composite, Bool double_buffer, Bool duplicate_for_composite,
Bool srgb_only) Bool srgb_only)
{ {
EGLint value; EGLint value;
bool valid_depth;
int i;
struct egl_config *c = calloc(1, sizeof *c); struct egl_config *c = calloc(1, sizeof *c);
if (!c) if (!c)
@ -218,6 +220,19 @@ translate_eglconfig(struct egl_screen *screen, EGLConfig hc,
} }
#undef GET #undef GET
/* Only expose this config if rgbBits matches a supported
* depth value.
*/
valid_depth = false;
for (i = 0; i < pScreen->numDepths && !valid_depth; i++) {
if (pScreen->allowedDepths[i].depth == c->base.rgbBits)
valid_depth = true;
}
if (!valid_depth) {
free(c);
return chain;
}
/* derived state: config caveats */ /* derived state: config caveats */
eglGetConfigAttrib(screen->display, hc, EGL_CONFIG_CAVEAT, &value); eglGetConfigAttrib(screen->display, hc, EGL_CONFIG_CAVEAT, &value);
if (value == EGL_NONE) if (value == EGL_NONE)
@ -340,13 +355,13 @@ egl_mirror_configs(ScreenPtr pScreen, struct egl_screen *screen)
for (j = 0; j < 3; j++) /* direct_color */ for (j = 0; j < 3; j++) /* direct_color */
for (k = 0; k < 2; k++) /* double_buffer */ { for (k = 0; k < 2; k++) /* double_buffer */ {
if (can_srgb) if (can_srgb)
c = translate_eglconfig(screen, host_configs[i], c, c = translate_eglconfig(pScreen, screen, host_configs[i], c,
/* direct_color */ j == 1, /* direct_color */ j == 1,
/* double_buffer */ k > 0, /* double_buffer */ k > 0,
/* duplicate_for_composite */ j == 0, /* duplicate_for_composite */ j == 0,
/* srgb_only */ true); /* srgb_only */ true);
c = translate_eglconfig(screen, host_configs[i], c, c = translate_eglconfig(pScreen, screen, host_configs[i], c,
/* direct_color */ j == 1, /* direct_color */ j == 1,
/* double_buffer */ k > 0, /* double_buffer */ k > 0,
/* duplicate_for_composite */ j == 0, /* duplicate_for_composite */ j == 0,