Date: Thursday, October 27, 2016 @ 09:44:17 Author: lcarlier Revision: 279320
upgpkg: mesa 13.0.0rc2-1 upstream update 13.0.0-rc2 - and llvm-3.9.0 rebuild Deleted: mesa/trunk/0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch mesa/trunk/0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch -----------------------------------------------------------------+ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch | 91 ---------- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch | 59 ------ 2 files changed, 150 deletions(-) Deleted: 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch =================================================================== --- 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-27 09:14:57 UTC (rev 279319) +++ 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch 2016-10-27 09:44:17 UTC (rev 279320) @@ -1,91 +0,0 @@ -From 0247e5ee3edd546b8598082d5b45d110f61853d0 Mon Sep 17 00:00:00 2001 -From: Martin Peres <[email protected]> -Date: Thu, 6 Oct 2016 17:07:22 +0300 -Subject: [PATCH 1/2] loader/dri3: add get_dri_screen() to the vtable - -This allows querying the current active screen from the -loader's common code. - -Cc: [email protected] -Reviewed-by: Emil Velikov <[email protected]> -Signed-off-by: Martin Peres <[email protected]> ---- - src/egl/drivers/dri2/platform_x11_dri3.c | 12 ++++++++++++ - src/glx/dri3_glx.c | 11 +++++++++++ - src/loader/loader_dri3_helper.h | 1 + - 3 files changed, 24 insertions(+) - -diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c -index 31649fe..d93f5bc 100644 ---- a/src/egl/drivers/dri2/platform_x11_dri3.c -+++ b/src/egl/drivers/dri2/platform_x11_dri3.c -@@ -103,6 +103,17 @@ egl_dri3_get_dri_context(struct loader_dri3_drawable *draw) - return dri2_ctx->dri_context; - } - -+static __DRIscreen * -+egl_dri3_get_dri_screen(struct loader_dri3_drawable *draw) -+{ -+ _EGLContext *ctx = _eglGetCurrentContext(); -+ struct dri2_egl_context *dri2_ctx; -+ if (!ctx) -+ return NULL; -+ dri2_ctx = dri2_egl_context(ctx); -+ return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen; -+} -+ - static void - egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags) - { -@@ -119,6 +130,7 @@ static struct loader_dri3_vtable egl_dri3_vtable = { - .set_drawable_size = egl_dri3_set_drawable_size, - .in_current_context = egl_dri3_in_current_context, - .get_dri_context = egl_dri3_get_dri_context, -+ .get_dri_screen = egl_dri3_get_dri_screen, - .flush_drawable = egl_dri3_flush_drawable, - .show_fps = NULL, - }; -diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c -index 90d7bba..51b6b1c 100644 ---- a/src/glx/dri3_glx.c -+++ b/src/glx/dri3_glx.c -@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_dri3_drawable *draw) - return (gc != &dummyContext) ? dri3Ctx->driContext : NULL; - } - -+static __DRIscreen * -+glx_dri3_get_dri_screen(struct loader_dri3_drawable *draw) -+{ -+ struct glx_context *gc = __glXGetCurrentContext(); -+ struct dri3_context *pcp = (struct dri3_context *) gc; -+ struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc; -+ -+ return (gc != &dummyContext && psc) ? psc->driScreen : NULL; -+} -+ - static void - glx_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags) - { -@@ -169,6 +179,7 @@ static struct loader_dri3_vtable glx_dri3_vtable = { - .set_drawable_size = glx_dri3_set_drawable_size, - .in_current_context = glx_dri3_in_current_context, - .get_dri_context = glx_dri3_get_dri_context, -+ .get_dri_screen = glx_dri3_get_dri_screen, - .flush_drawable = glx_dri3_flush_drawable, - .show_fps = glx_dri3_show_fps, - }; -diff --git a/src/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h -index 5b8fd1d..658e190 100644 ---- a/src/loader/loader_dri3_helper.h -+++ b/src/loader/loader_dri3_helper.h -@@ -103,6 +103,7 @@ struct loader_dri3_vtable { - void (*set_drawable_size)(struct loader_dri3_drawable *, int, int); - bool (*in_current_context)(struct loader_dri3_drawable *); - __DRIcontext *(*get_dri_context)(struct loader_dri3_drawable *); -+ __DRIscreen *(*get_dri_screen)(struct loader_dri3_drawable *); - void (*flush_drawable)(struct loader_dri3_drawable *, unsigned); - void (*show_fps)(struct loader_dri3_drawable *, uint64_t); - }; --- -2.10.0 - Deleted: 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch =================================================================== --- 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch 2016-10-27 09:14:57 UTC (rev 279319) +++ 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch 2016-10-27 09:44:17 UTC (rev 279320) @@ -1,59 +0,0 @@ -From a599b1c2037ac8aca6c92350c8a7b3e42c81deaa Mon Sep 17 00:00:00 2001 -From: Martin Peres <[email protected]> -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 <[email protected]> -Tested-by: Ionut Biru <[email protected]> -Cc: [email protected] -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759 -Reviewed-by: Emil Velikov <[email protected]> -Signed-off-by: Martin Peres <[email protected]> ---- - 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 -
