From a6f534107a15869941fa4e1a05c974f6e0ea2ffa Mon Sep 17 00:00:00 2001 From: Jocelyn Falempe Date: Tue, 22 Oct 2024 10:48:43 +0200 Subject: [PATCH] gbm/dri: Fix color format for big endian. 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 Cc: mesa-stable Part-of: (cherry picked from commit b24d4f0c8697d53ac035472590bcc2fd16c010ce) --- .pick_status.json | 2 +- src/gbm/backends/dri/gbm_dri.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 00f82d9e14d..4159ce57728 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 0cb318d31e8..52cd2589aca 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -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 },