Attachment 126988 Details for Bug 71759 – [WIP] dri3: import prime buffers in the currently-bound screen

[patch] [WIP] dri3: import prime buffers in the currently-bound screen

0001-WIP-dri3-import-prime-buffers-in-the-currently-bound.patch (text/plain), 5.50 KB, created by Martin Peres on 2016-10-04 10:13:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Peres

Created: 2016-10-04 10:13:14 UTC

Size: 5.50 KB

patch

obsolete

>From 5113845fae9b95dba0da59229a2e9947cef4196f Mon Sep 17 00:00:00 2001
>From: Martin Peres <martin.peres@linux.intel.com>
>Date: Tue, 4 Oct 2016 13:08:43 +0300
>Subject: [PATCH] [WIP] 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)
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
>---
> src/egl/drivers/dri2/platform_x11_dri3.c | 12 ++++++++++++
> src/glx/dri3_glx.c                       | 11 +++++++++++
> src/loader/loader_dri3_helper.c          | 12 +++++++++++-
> src/loader/loader_dri3_helper.h          |  1 +
> src/mesa/drivers/dri/i965/intel_screen.c |  1 +
> 5 files changed, 36 insertions(+), 1 deletion(-)
>
>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..3bc2e1b 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 *) __glXGetCurrentContext();
>+   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.c b/src/loader/loader_dri3_helper.c
>index 3ce0352..ed2fde1 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 current-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;
>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);
> };
>diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
>index 9b23bac..dac7c75 100644
>--- a/src/mesa/drivers/dri/i965/intel_screen.c
>+++ b/src/mesa/drivers/dri/i965/intel_screen.c
>@@ -703,6 +703,7 @@ intel_create_image_from_fds(__DRIscreen *dri_screen,
> {
>    struct intel_screen *screen = dri_screen->driverPrivate;
>    struct intel_image_format *f;
>+   dri_bufmgr *bufmgr;
>    __DRIimage *image;
>    int i, index;
> 
>-- 
>2.10.0
>

Actions: View | Splinter Review

Attachments on bug 71759: 120428 | 122003 | 122004 | 122005 | 122006 | 122880 | 125507 | 125508 | 125574 | 126988

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.