mirror of
https://src.fedoraproject.org/rpms/mesa.git
synced 2024-11-24 09:32:42 +00:00
Merge remote-tracking branch 'origin/master' into f24
This commit is contained in:
Hans de Goede
commit
1b20d7cee0
3 changed files with 156 additions and 1 deletions
91
0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
Normal file
91
0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
From 7effaf722086c91a878b4f1c16be3f7fa46f038a Mon Sep 17 00:00:00 2001
|
||||
From: Martin Peres <martin.peres@linux.intel.com>
|
||||
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: mesa-stable@lists.freedesktop.org
|
||||
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
||||
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
|
||||
---
|
||||
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 9363a8a..69bfcd8 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.9.3
|
||||
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
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
|
||||
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
Name: mesa
|
||||
Summary: Mesa graphics libraries
|
||||
Version: 12.0.3
|
||||
Release: 1%{?rctag:.%{rctag}}%{?dist}
|
||||
Release: 2%{?rctag:.%{rctag}}%{?dist}
|
||||
|
||||
License: MIT
|
||||
URL: http://www.mesa3d.org
|
||||
|
|
@ -65,6 +65,8 @@ Patch4: 0004-bigendian-assert.patch
|
|||
|
||||
# Cherry picked from upstream master
|
||||
Patch5: 0001-pipe_loader_sw-Fix-fd-leak-when-instantiated-via-pip.patch
|
||||
Patch6: 0001-loader-dri3-add-get_dri_screen-to-the-vtable.patch
|
||||
Patch7: 0002-loader-dri3-import-prime-buffers-in-the-currently-bo.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -620,6 +622,9 @@ popd
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 11 2016 Hans de Goede <hdegoede@redhat.com> - 12.0.3-2
|
||||
- Add 2 patches from upstream to fix DRI3 vaapi crashes (rhbz1309446, fdo71759)
|
||||
|
||||
* Sun Sep 18 2016 Peter Robinson <pbrobinson@fedoraproject.org> 12.0.3-1
|
||||
- 12.0.3
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue