From: Fabio Berton Date: Tue, 27 Feb 2018 13:12:12 +0000 (-0300) Subject: mesa: Remove patch applied on mesa 18.0.0-rc4 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F18795%2F2;p=meta-freescale.git mesa: Remove patch applied on mesa 18.0.0-rc4 WIP-st-dri-Allow-YUYV-import.patch was already applied on mesa 18.0.0-rc4 Change-Id: Ifead7707b2aff090b8e8355a9ea33c05cea9de32 Signed-off-by: Fabio Berton --- diff --git a/recipes-graphics/mesa/mesa/WIP-st-dri-Allow-YUYV-import.patch b/recipes-graphics/mesa/mesa/WIP-st-dri-Allow-YUYV-import.patch deleted file mode 100644 index 43103fa4..00000000 --- a/recipes-graphics/mesa/mesa/WIP-st-dri-Allow-YUYV-import.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c276e110f520c8f9e1795b4a85dec3f28ef38d89 Mon Sep 17 00:00:00 2001 -From: Philipp Zabel -Date: Mon, 11 Apr 2016 18:50:58 +0200 -Subject: [PATCH] WIP: st/dri: Allow YUYV import - -Unclear whether this is the right way, but this allows to import -dma-buffers with YUYV pixel format. - -Signed-off-by: Philipp Zabel ---- - src/gallium/state_trackers/dri/dri2.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c -index b50e096443..9c61f01547 100644 ---- a/src/gallium/state_trackers/dri/dri2.c -+++ b/src/gallium/state_trackers/dri/dri2.c -@@ -84,6 +84,10 @@ static int convert_fourcc(int format, int *dri_components_p) - format = __DRI_IMAGE_FORMAT_GR88; - dri_components = __DRI_IMAGE_COMPONENTS_RG; - break; -+ case __DRI_IMAGE_FOURCC_YUYV: -+ format = __DRI_IMAGE_FOURCC_YUYV; -+ dri_components = __DRI_IMAGE_COMPONENTS_Y_XUXV; /* FIXME */ -+ break; - /* - * For multi-planar YUV formats, we return the format of the first - * plane only. Since there is only one caller which supports multi- -@@ -164,6 +168,9 @@ static enum pipe_format dri2_format_to_pipe_format (int format) - case __DRI_IMAGE_FORMAT_GR88: - pf = PIPE_FORMAT_RG88_UNORM; - break; -+ case __DRI_IMAGE_FOURCC_YUYV: -+ pf = PIPE_FORMAT_YUYV; -+ break; - default: - pf = PIPE_FORMAT_NONE; - break; --- -2.11.0 - diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 687e87fc..66ff9aec 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -7,7 +7,6 @@ PROVIDES_remove_imxgpu3d = "virtual/libgl" SRC_URI_append = " \ file://0015-Enable-MESA_ycbcr_texture-for-GLES1-and-GLES2.patch \ - file://WIP-st-dri-Allow-YUYV-import.patch \ "