summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/mesa/mesa/0006-dri-don-t-call-modifier-interfaces-when-modifiers_co.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics/mesa/mesa/0006-dri-don-t-call-modifier-interfaces-when-modifiers_co.patch')
-rw-r--r--recipes-graphics/mesa/mesa/0006-dri-don-t-call-modifier-interfaces-when-modifiers_co.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/recipes-graphics/mesa/mesa/0006-dri-don-t-call-modifier-interfaces-when-modifiers_co.patch b/recipes-graphics/mesa/mesa/0006-dri-don-t-call-modifier-interfaces-when-modifiers_co.patch
deleted file mode 100644
index 765cc0ac..00000000
--- a/recipes-graphics/mesa/mesa/0006-dri-don-t-call-modifier-interfaces-when-modifiers_co.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 77fcf700826d6637e4e407c73c209f3b1718a26e Mon Sep 17 00:00:00 2001
2From: Lucas Stach <l.stach@pengutronix.de>
3Date: Thu, 20 May 2021 18:07:12 +0200
4Subject: [PATCH] dri: don't call modifier interfaces when modifiers_count is 0
5
6The wayland EGL platform sets the modifier count to 0 in some cases
7to signal that modifiers should not be used, even if a list of modifiers
8is present. The loader_dri_create_image helper didn't handle this case
9properly and called the modifierful driver interface with a 0 modifier
10count, leading to the obvious outcome of the driver being unable to
11allocate an image.
12
13Fixes: cb9ae4273d68 ("dri: add loader_dri_create_image helper")
14Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
15Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10903>
16Upstream-Status: Applied [https://gitlab.freedesktop.org/mesa/mesa/-/commit/77fcf700826d6637e4e407c73c209f3b1718a26e]
17---
18 src/loader/loader_dri_helper.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/src/loader/loader_dri_helper.c b/src/loader/loader_dri_helper.c
22index 972ca2da26a..ff6ce35953f 100644
23--- a/src/loader/loader_dri_helper.c
24+++ b/src/loader/loader_dri_helper.c
25@@ -37,7 +37,7 @@ __DRIimage *loader_dri_create_image(__DRIscreen *screen,
26 unsigned int modifiers_count,
27 void *loaderPrivate)
28 {
29- if (modifiers &&
30+ if (modifiers && modifiers_count > 0 &&
31 image->base.version > 14 && image->createImageWithModifiers) {
32 bool has_valid_modifier = false;
33 int i;
34--
352.31.1
36