From 0fcb0ac1c5c81d93db81bdfeb9a2161ac216feca Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 2 Jul 2025 18:30:29 +0100 Subject: [PATCH] dri: Expand pipe_format <-> FourCC lookup table This pulls in every known mapping from the core DRI frontend, as well as from GBM and Wayland. We can then start using it to de-duplicate the lookups all throughout the tree. Signed-off-by: Daniel Stone Part-of: --- src/loader/loader_dri_helper.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/loader/loader_dri_helper.c b/src/loader/loader_dri_helper.c index b92abd8a0fc..7d8ea3f65c9 100644 --- a/src/loader/loader_dri_helper.c +++ b/src/loader/loader_dri_helper.c @@ -38,11 +38,24 @@ static const struct { enum pipe_format pipe; uint32_t fourcc; } pipe_format_to_fourcc[] = { + { PIPE_FORMAT_R8_UNORM, DRM_FORMAT_R8 }, + { PIPE_FORMAT_R16_UNORM, DRM_FORMAT_R16 }, + { PIPE_FORMAT_RG88_UNORM, DRM_FORMAT_GR88 }, + { PIPE_FORMAT_RG1616_UNORM, DRM_FORMAT_GR1616 }, + { PIPE_FORMAT_B5G6R5_UNORM, DRM_FORMAT_RGB565 }, + { PIPE_FORMAT_B5G5R5A1_UNORM, DRM_FORMAT_ARGB1555 }, + { PIPE_FORMAT_R5G5B5A1_UNORM, DRM_FORMAT_ABGR1555 }, + { PIPE_FORMAT_B4G4R4A4_UNORM, DRM_FORMAT_ARGB4444 }, + { PIPE_FORMAT_R4G4B4A4_UNORM, DRM_FORMAT_ABGR4444 }, + { PIPE_FORMAT_B8G8R8_UNORM, DRM_FORMAT_RGB888 }, + { PIPE_FORMAT_R8G8B8_UNORM, DRM_FORMAT_BGR888 }, { PIPE_FORMAT_B8G8R8X8_SRGB, __DRI_IMAGE_FOURCC_SXRGB8888 }, { PIPE_FORMAT_B8G8R8A8_SRGB, __DRI_IMAGE_FOURCC_SARGB8888 }, { PIPE_FORMAT_R8G8B8A8_SRGB, __DRI_IMAGE_FOURCC_SABGR8888 }, - { PIPE_FORMAT_B5G5R5A1_UNORM, DRM_FORMAT_ARGB1555 }, - { PIPE_FORMAT_B5G6R5_UNORM, DRM_FORMAT_RGB565 }, + { PIPE_FORMAT_X8B8G8R8_UNORM, DRM_FORMAT_RGBX8888 }, + { PIPE_FORMAT_A8B8G8R8_UNORM, DRM_FORMAT_RGBA8888 }, + { PIPE_FORMAT_X8R8G8B8_UNORM, DRM_FORMAT_BGRX8888 }, + { PIPE_FORMAT_A8R8G8B8_UNORM, DRM_FORMAT_BGRA8888 }, { PIPE_FORMAT_B8G8R8X8_UNORM, DRM_FORMAT_XRGB8888 }, { PIPE_FORMAT_B8G8R8A8_UNORM, DRM_FORMAT_ARGB8888 }, { PIPE_FORMAT_R8G8B8X8_UNORM, DRM_FORMAT_XBGR8888 },