debian/changelog | 3 ++
debian/patches/series | 1
debian/patches/xmir-fixes.diff | 61 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
New commits:
commit 11836c11427241ab44cf3071d2d5df543396d9f0
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 17 10:50:17 2016 +0200
xmir-fixes.diff: Port to new glamor api.
diff --git a/debian/changelog b/debian/changelog
index abec0da..f75d4dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ xorg-server (2:1.18.99.902-1ubuntu1) UNRELEASED;
urgency=medium
- Support both Mir 0.24 and 0.25 client APIs
- Fix crashing on arm64 (LP: #1642297)
+ [ Timo Aaltonen ]
+ * xmir-fixes.diff: Port to new glamor api.
+
-- Robert Ancell <robert.anc...@canonical.com> Thu, 17 Nov 2016 15:25:26
+1300
xorg-server (2:1.18.99.902-1) experimental; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index a111a0e..50dd8f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@ xmir.patch
xmir-desktop-file-hint-flag.patch
xi2-resize-touch.patch
randr-do-not-check-the-screen-size.diff
+xmir-fixes.diff
diff --git a/debian/patches/xmir-fixes.diff b/debian/patches/xmir-fixes.diff
new file mode 100644
index 0000000..0424712
--- /dev/null
+++ b/debian/patches/xmir-fixes.diff
@@ -0,0 +1,61 @@
+--- a/hw/xmir/xmir-glamor.c
++++ b/hw/xmir/xmir-glamor.c
+@@ -245,11 +245,6 @@ xmir_glamor_copy_egl_tex(int fbo, Drawab
+ glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, GL_FALSE,
+ 2 * sizeof(float), texcoords);
+ glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
+- if (!fbo) {
+- glUseProgram(glamor_priv->finish_access_prog[0]);
+- glUniform1i(glamor_priv->finish_access_revert[0], REVERT_NONE);
+- glUniform1i(glamor_priv->finish_access_swap_rb[0],
SWAP_NONE_UPLOADING);
+- }
+
+ if (!swap_xy) {
+ float _tx1, _tx2, _ty1, _ty2;
+@@ -606,7 +601,6 @@ xmir_glamor_copy_egl_queue(struct xmir_s
+ * rotating back and forth.
+ */
+ glamor_set_pixmap_type(src_pixmap, GLAMOR_TEXTURE_DRM);
+- src_pixmap_priv->fbo->external = TRUE;
+
+ xmir_win->image = eglCreateImageKHR(xmir_screen->egl_display,
xmir_screen->egl_context, EGL_GL_TEXTURE_2D_KHR,
(EGLClientBuffer)(intptr_t)src_pixmap_priv->fbo->tex, attribs);
+ if (!xmir_win->image) {
+@@ -925,12 +919,6 @@ xmir_glamor_fini(struct xmir_screen *xmi
+ free(xmir_screen->device_name);
+ }
+
+-void
+-glamor_egl_destroy_textured_pixmap(PixmapPtr pixmap)
+-{
+- glamor_destroy_textured_pixmap(pixmap);
+-}
+-
+ static void
+ xmir_glamor_get_name_from_bo(int drm_fd, struct gbm_bo *bo, int *name)
+ {
+@@ -1019,12 +1007,6 @@ glamor_egl_dri3_fd_name_from_tex(ScreenP
+ return fd;
+ }
+
+-unsigned int
+-glamor_egl_create_argb8888_based_texture(ScreenPtr screen, int w, int h, Bool
linear)
+-{
+- return 0;
+-}
+-
+ static PixmapPtr
+ xmir_glamor_create_pixmap(ScreenPtr screen,
+ int width, int height, int depth, unsigned int hint)
+@@ -1105,12 +1087,6 @@ free:
+ return glamor_create_pixmap(screen, width, height, depth, hint);
+ }
+
+-void
+-glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
+-{
+- /* XXX: Unused */
+-}
+-
+ static Bool
+ xmir_glamor_destroy_pixmap(PixmapPtr pixmap)
+ {
