1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From c03e79d7831f253b16d6f52f2fb959eb02257a8b Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Tue, 15 Dec 2020 14:59:21 +0100
Subject: [PATCH] loader/dri: hook up createImageWithModifiers2
Call into the new modifiers with usage createImage variant when available
to provide the DRI implementation with more context about the allocation.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8106>
Upstream-Status: Applied [https://gitlab.freedesktop.org/mesa/mesa/-/commit/c03e79d7831f253b16d6f52f2fb959eb02257a8b]
---
src/loader/loader_dri_helper.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/loader/loader_dri_helper.c b/src/loader/loader_dri_helper.c
index 21419f087d6..972ca2da26a 100644
--- a/src/loader/loader_dri_helper.c
+++ b/src/loader/loader_dri_helper.c
@@ -57,9 +57,15 @@ __DRIimage *loader_dri_create_image(__DRIscreen *screen,
if (!has_valid_modifier)
return NULL;
- return image->createImageWithModifiers(screen, width, height,
- dri_format, modifiers,
- modifiers_count, loaderPrivate);
+ if (image->base.version >= 19 && image->createImageWithModifiers2)
+ return image->createImageWithModifiers2(screen, width, height,
+ dri_format, modifiers,
+ modifiers_count, dri_usage,
+ loaderPrivate);
+ else
+ return image->createImageWithModifiers(screen, width, height,
+ dri_format, modifiers,
+ modifiers_count, loaderPrivate);
}
/* No modifier given or fallback to the legacy createImage allowed */
--
2.31.1
|
