mirror of
https://src.fedoraproject.org/rpms/mesa.git
synced 2024-11-24 09:32:42 +00:00
60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
|
From a84a4062660d0469ff9348ef713427db54f9f40e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Martin Peres <martin.peres@linux.intel.com>
|
||
|
|
Date: Thu, 6 Oct 2016 17:10:35 +0300
|
||
|
|
Subject: [PATCH 2/2] loader/dri3: import prime buffers in the currently-bound
|
||
|
|
screen
|
||
|
|
|
||
|
|
This tries to mirrors the codepath taken by DRI2 in IntelSetTexBuffer2()
|
||
|
|
and fixes many applications when using DRI3:
|
||
|
|
- Totem with libva on hw-accelerated decoding
|
||
|
|
- obs-studio, using Window Capture (Xcomposite) as a Source
|
||
|
|
- gstreamer with VAAPI
|
||
|
|
|
||
|
|
v2:
|
||
|
|
- introduce get_dri_screen() in the dri3 loader's vtable (krh)
|
||
|
|
|
||
|
|
Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
|
||
|
|
Tested-by: Ionut Biru <biru.ionut@gmail.com>
|
||
|
|
Cc: mesa-stable@lists.freedesktop.org
|
||
|
|
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
|
||
|
|
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
||
|
|
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
|
||
|
|
---
|
||
|
|
src/loader/loader_dri3_helper.c | 12 +++++++++++-
|
||
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
|
||
|
|
index 67d0c2c..14e7262 100644
|
||
|
|
--- a/src/loader/loader_dri3_helper.c
|
||
|
|
+++ b/src/loader/loader_dri3_helper.c
|
||
|
|
@@ -1116,6 +1116,7 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
|
||
|
|
xcb_sync_fence_t sync_fence;
|
||
|
|
struct xshmfence *shm_fence;
|
||
|
|
int fence_fd;
|
||
|
|
+ __DRIscreen *cur_screen;
|
||
|
|
|
||
|
|
if (buffer)
|
||
|
|
return buffer;
|
||
|
|
@@ -1146,8 +1147,17 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format,
|
||
|
|
if (!bp_reply)
|
||
|
|
goto no_image;
|
||
|
|
|
||
|
|
+ /* Get the currently-bound screen or revert to using the drawable's screen if
|
||
|
|
+ * no contexts are currently bound. The latter case is at least necessary for
|
||
|
|
+ * obs-studio, when using Window Capture (Xcomposite) as a Source.
|
||
|
|
+ */
|
||
|
|
+ cur_screen = draw->vtable->get_dri_screen(draw);
|
||
|
|
+ if (!cur_screen) {
|
||
|
|
+ cur_screen = draw->dri_screen;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
buffer->image = loader_dri3_create_image(draw->conn, bp_reply, format,
|
||
|
|
- draw->dri_screen, draw->ext->image,
|
||
|
|
+ cur_screen, draw->ext->image,
|
||
|
|
buffer);
|
||
|
|
if (!buffer->image)
|
||
|
|
goto no_image;
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|