fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 20:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gbm/dri: Fix color format for big endian.

Browse source 
Using wayland on s390x has all the colors wrong.
Mesa reports using GBM_FORMAT_XRGB8888 but inside the buffer, the
colors are in GBM_FORMAT_BGRX8888 order.
This patch fixes it for common formats, and also introduced BGRX8888
which is the default on big endian.

Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31707>
(cherry picked from commit b24d4f0c86)
This commit is contained in:
Jocelyn Falempe 2024-10-22 10:48:43 +02:00 • committed by Eric Engestrom
parent 325ee5941d
commit a6f534107a
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -734,7 +734,7 @@
"description": "gbm/dri: Fix color format for big endian.",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

16
src/gbm/backends/dri/gbm_dri.c
View file

@ -360,14 +360,18 @@ dri_screen_create_sw(struct gbm_dri_device *dri, bool driver_name_is_inferred)
static const struct gbm_dri_visual gbm_dri_visuals_table[] = {
{ GBM_FORMAT_R8, PIPE_FORMAT_R8_UNORM },
{ GBM_FORMAT_R16, PIPE_FORMAT_R16_UNORM },
{ GBM_FORMAT_GR88, PIPE_FORMAT_RG88_UNORM },
{ GBM_FORMAT_GR1616, PIPE_FORMAT_RG1616_UNORM },
{ GBM_FORMAT_GR88, PIPE_FORMAT_R8G8_UNORM },
{ GBM_FORMAT_GR1616, PIPE_FORMAT_R16G16_UNORM },
{ GBM_FORMAT_ARGB1555, PIPE_FORMAT_B5G5R5A1_UNORM },
{ GBM_FORMAT_RGB565, PIPE_FORMAT_B5G6R5_UNORM },
{ GBM_FORMAT_XRGB8888, PIPE_FORMAT_BGRX8888_UNORM },
{ GBM_FORMAT_ARGB8888, PIPE_FORMAT_BGRA8888_UNORM },
{ GBM_FORMAT_XBGR8888, PIPE_FORMAT_RGBX8888_UNORM },
{ GBM_FORMAT_ABGR8888, PIPE_FORMAT_RGBA8888_UNORM },
{ GBM_FORMAT_BGRX8888, PIPE_FORMAT_X8R8G8B8_UNORM },
{ GBM_FORMAT_BGRA8888, PIPE_FORMAT_A8R8G8B8_UNORM },
{ GBM_FORMAT_RGBX8888, PIPE_FORMAT_X8B8G8R8_UNORM },
{ GBM_FORMAT_RGBA8888, PIPE_FORMAT_A8B8G8R8_UNORM },
{ GBM_FORMAT_XRGB8888, PIPE_FORMAT_B8G8R8X8_UNORM },
{ GBM_FORMAT_ARGB8888, PIPE_FORMAT_B8G8R8A8_UNORM },
{ GBM_FORMAT_XBGR8888, PIPE_FORMAT_R8G8B8X8_UNORM },
{ GBM_FORMAT_ABGR8888, PIPE_FORMAT_R8G8B8A8_UNORM },
{ GBM_FORMAT_XRGB2101010, PIPE_FORMAT_B10G10R10X2_UNORM },
{ GBM_FORMAT_ARGB2101010, PIPE_FORMAT_B10G10R10A2_UNORM },
{ GBM_FORMAT_XBGR2101010, PIPE_FORMAT_R10G10B10X2_UNORM },