diff options
author | Britney Fransen <brfransen@gmail.com> | 2017-03-29 17:14:47 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2017-03-29 17:14:47 (GMT) |
commit | 7593a128607420b10a7317ff1bf2be2142073d3a (patch) | |
tree | 8e02d069bc17741fdc6700a581ea77599ac86dfc /abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch | |
parent | d914020b4fb3fd3c7372644cf71026ea8e21ea94 (diff) | |
download | linhes_pkgbuild-7593a128607420b10a7317ff1bf2be2142073d3a.zip linhes_pkgbuild-7593a128607420b10a7317ff1bf2be2142073d3a.tar.gz linhes_pkgbuild-7593a128607420b10a7317ff1bf2be2142073d3a.tar.bz2 |
mesa: update to 17.0.2
Diffstat (limited to 'abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch')
-rw-r--r-- | abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch b/abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch deleted file mode 100644 index 893872b..0000000 --- a/abs/core/mesa/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a599b1c2037ac8aca6c92350c8a7b3e42c81deaa 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 3ce0352..8179297 100644 ---- a/src/loader/loader_dri3_helper.c -+++ b/src/loader/loader_dri3_helper.c -@@ -1117,6 +1117,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; -@@ -1147,8 +1148,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.10.0 - |