fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dril: Fixup order of pixel formats in drilConfigs

Browse source 
Having the RGB* formats before the BGR* formats in the table causes
problems where under some circumstances, some applications end up
with the wrong colors.

The repro case for me is: Xvnc + mutter + chromium

There was an existing comment in dri_fill_in_modes() which explained
the problem. This was lost when dril_target.c was created.

Fixes: ec7afd2c24 ("dril: rework config creation")
Fixes: 3de62b2f9a ("gallium/dril: Compatibility stub for the legacy DRI loader interface")

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31950>
(cherry picked from commit e1098310da)
This commit is contained in:
Benjamin Herrenschmidt 2024-11-04 17:45:45 +11:00 • committed by Eric Engestrom
parent d73b751b90
commit a47d11b736
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -54,7 +54,7 @@
"description": "dril: Fixup order of pixel formats in drilConfigs",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ec7afd2c24c6afa6a5c80da4f80e0b799580e12a",
"notes": null

36
src/gallium/targets/dril/dril_target.c
View file

@ -47,25 +47,43 @@
CONFIG_ZS(color, PIPE_FORMAT_Z16_UNORM), \
CONFIG_ZS(color, PIPE_FORMAT_NONE) \
/*
* (copy of a comment in dri_screen.c:dri_fill_in_modes())
*
* The 32-bit RGBA format must not precede the 32-bit BGRA format.
* Likewise for RGBX and BGRX. Otherwise, the GLX client and the GLX
* server may disagree on which format the GLXFBConfig represents,
* resulting in swapped color channels.
*
* The problem, as of 2017-05-30:
* When matching a GLXFBConfig to a __DRIconfig, GLX ignores the channel
* order and chooses the first __DRIconfig with the expected channel
* sizes. Specifically, GLX compares the GLXFBConfig's and __DRIconfig's
* __DRI_ATTRIB_{CHANNEL}_SIZE but ignores __DRI_ATTRIB_{CHANNEL}_MASK.
*
* EGL does not suffer from this problem. It correctly compares the
* channel masks when matching EGLConfig to __DRIconfig.
*/
static const struct gl_config drilConfigs[] = {
CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
CONFIG(PIPE_FORMAT_B8G8R8A8_UNORM),
CONFIG(PIPE_FORMAT_B8G8R8X8_UNORM),
CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
CONFIG(PIPE_FORMAT_R8G8B8A8_UNORM),
CONFIG(PIPE_FORMAT_R8G8B8X8_UNORM),
CONFIG(PIPE_FORMAT_B10G10R10A2_UNORM),
CONFIG(PIPE_FORMAT_B10G10R10X2_UNORM),
CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
CONFIG(PIPE_FORMAT_R10G10B10A2_UNORM),
CONFIG(PIPE_FORMAT_R10G10B10X2_UNORM),
CONFIG(PIPE_FORMAT_B5G6R5_UNORM),
CONFIG(PIPE_FORMAT_B5G5R5A1_UNORM),
CONFIG(PIPE_FORMAT_B5G5R5X1_UNORM),
CONFIG(PIPE_FORMAT_B4G4R4A4_UNORM),
CONFIG(PIPE_FORMAT_B4G4R4X4_UNORM),
CONFIG(PIPE_FORMAT_R5G6B5_UNORM),
CONFIG(PIPE_FORMAT_R5G5B5A1_UNORM),
CONFIG(PIPE_FORMAT_R5G5B5X1_UNORM),
CONFIG(PIPE_FORMAT_R4G4B4A4_UNORM),
CONFIG(PIPE_FORMAT_R4G4B4X4_UNORM),
};
#define RGB UTIL_FORMAT_COLORSPACE_RGB