From 1021d6fe62d26383c2ff2f1b5745a308193bb064 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 15 Jan 2025 13:53:28 +0100 Subject: [PATCH] dri: deal with ARGB1555 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This helps fixing "glx-visuals-... -pixmap" which uses this format. cc: mesa-stable Reviewed-by: Marek Olšák Reviewed-by: Eric Engestrom Part-of: --- src/gallium/frontends/dri/loader_dri3_helper.c | 1 + src/loader/loader_dri_helper.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/gallium/frontends/dri/loader_dri3_helper.c b/src/gallium/frontends/dri/loader_dri3_helper.c index c854d9e9de6..9e4ca3f5707 100644 --- a/src/gallium/frontends/dri/loader_dri3_helper.c +++ b/src/gallium/frontends/dri/loader_dri3_helper.c @@ -1283,6 +1283,7 @@ dri3_cpp_for_fourcc(uint32_t format) { switch (format) { case DRM_FORMAT_R8: return 1; + case DRM_FORMAT_ARGB1555: case DRM_FORMAT_RGB565: case DRM_FORMAT_GR88: return 2; diff --git a/src/loader/loader_dri_helper.c b/src/loader/loader_dri_helper.c index e6f0e2d51d0..ff224b02104 100644 --- a/src/loader/loader_dri_helper.c +++ b/src/loader/loader_dri_helper.c @@ -45,6 +45,7 @@ loader_fourcc_to_image_format(int fourcc) case __DRI_IMAGE_FOURCC_SABGR8888: return __DRI_IMAGE_FORMAT_SABGR8; case __DRI_IMAGE_FOURCC_SXRGB8888: return __DRI_IMAGE_FORMAT_SXRGB8; case DRM_FORMAT_RGB565: return __DRI_IMAGE_FORMAT_RGB565; + case DRM_FORMAT_ARGB1555: return __DRI_IMAGE_FORMAT_ARGB1555; case DRM_FORMAT_XRGB8888: return __DRI_IMAGE_FORMAT_XRGB8888; case DRM_FORMAT_ARGB8888: return __DRI_IMAGE_FORMAT_ARGB8888; case DRM_FORMAT_ABGR8888: return __DRI_IMAGE_FORMAT_ABGR8888; @@ -82,6 +83,7 @@ loader_image_format_to_fourcc(int format) case __DRI_IMAGE_FORMAT_XBGR16161616: return DRM_FORMAT_XBGR16161616; case __DRI_IMAGE_FORMAT_XBGR16161616F: return DRM_FORMAT_XBGR16161616F; case __DRI_IMAGE_FORMAT_ABGR16161616F: return DRM_FORMAT_ABGR16161616F; + case __DRI_IMAGE_FORMAT_ARGB1555: return DRM_FORMAT_ARGB1555; } return 0; }