From 65600d0946193b786c3fa780c7e72c9dc0a49186 Mon Sep 17 00:00:00 2001 From: "Kasireddy, Vivek" Date: Tue, 12 Feb 2019 16:44:04 -0800 Subject: [PATCH] dri: Add XYUV8888 format MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In addition to adding this format to the dri_interface header, add an entry in the android and wayland backends as well. Signed-off-by: Vivek Kasireddy Reviewed-by: Lionel Landwerlin Reviewed-by: Tapani Pälli Reviewed-by: Eric Engestrom --- include/GL/internal/dri_interface.h | 2 ++ src/egl/drivers/dri2/egl_dri2.c | 1 + src/egl/drivers/dri2/platform_android.c | 1 + src/egl/wayland/wayland-drm/wayland-drm.xml | 1 + 4 files changed, 5 insertions(+) diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 26b4bb12908..0858092ecf5 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -1347,6 +1347,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_FOURCC_YUYV 0x56595559 #define __DRI_IMAGE_FOURCC_UYVY 0x59565955 #define __DRI_IMAGE_FOURCC_AYUV 0x56555941 +#define __DRI_IMAGE_FOURCC_XYUV8888 0x56555958 #define __DRI_IMAGE_FOURCC_YVU410 0x39555659 #define __DRI_IMAGE_FOURCC_YVU411 0x31315659 @@ -1378,6 +1379,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_COMPONENTS_Y_XUXV 0x3005 #define __DRI_IMAGE_COMPONENTS_Y_UXVX 0x3008 #define __DRI_IMAGE_COMPONENTS_AYUV 0x3009 +#define __DRI_IMAGE_COMPONENTS_XYUV 0x300A #define __DRI_IMAGE_COMPONENTS_R 0x3006 #define __DRI_IMAGE_COMPONENTS_RG 0x3007 diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 8721e67afb3..9c9b753fafe 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2247,6 +2247,7 @@ dri2_num_fourcc_format_planes(EGLint format) case DRM_FORMAT_UYVY: case DRM_FORMAT_VYUY: case DRM_FORMAT_AYUV: + case DRM_FORMAT_XYUV8888: return 1; case DRM_FORMAT_NV12: diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 5b530f2ba73..65ed936de10 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -73,6 +73,7 @@ static const struct droid_yuv_format droid_yuv_formats[] = { { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 0, 1, __DRI_IMAGE_FOURCC_YUV420 }, { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1, 1, __DRI_IMAGE_FOURCC_YVU420 }, { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1, 1, __DRI_IMAGE_FOURCC_AYUV }, + { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1, 1, __DRI_IMAGE_FOURCC_XYUV8888 }, }; static int diff --git a/src/egl/wayland/wayland-drm/wayland-drm.xml b/src/egl/wayland/wayland-drm/wayland-drm.xml index 83aa5615539..a1f2540e426 100644 --- a/src/egl/wayland/wayland-drm/wayland-drm.xml +++ b/src/egl/wayland/wayland-drm/wayland-drm.xml @@ -85,6 +85,7 @@ + -- 2.30.2