summaryrefslogtreecommitdiffstats
path: root/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_p...
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-08-07 23:24:17 +0000
committer Eric Hameleers <alien@slackware.com>2018-08-08 09:00:27 +0200
commit16c26916c02e8f062fc4cdf8fbb8f5be9b204093 (patch)
tree02357ef1554a0f6862af5b549fdf25cdeb3ccb4d /source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
parent2f3a6405501b3de32999677153f1bcb2f96b74ed (diff)
downloadcurrent-16c26916c02e8f062fc4cdf8fbb8f5be9b204093.tar.gz
current-16c26916c02e8f062fc4cdf8fbb8f5be9b204093.tar.xz
Tue Aug 7 23:24:17 UTC 201820180807232417
a/btrfs-progs-v4.17.1-x86_64-1.txz: Upgraded. a/sysvinit-scripts-2.1-noarch-16.txz: Rebuilt. rc.M: call update-gdk-pixbuf-loaders with HOME=/root to prevent creating a .cache directory in /. Thanks to Konrad Rzepecki. n/NetworkManager-1.12.2-x86_64-2.txz: Rebuilt. Fix libnm compile errors due to NM_AVAILABLE_IN_1_12_2 macro. x/xorg-server-1.20.1-x86_64-1.txz: Upgraded. x/xorg-server-xephyr-1.20.1-x86_64-1.txz: Upgraded. x/xorg-server-xnest-1.20.1-x86_64-1.txz: Upgraded. x/xorg-server-xvfb-1.20.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.16-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch')
-rw-r--r--source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch b/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
deleted file mode 100644
index ab92d3fca..000000000
--- a/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From patchwork Wed May 23 09:43:33 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [xserver, 2/2] glamor: Propagate glamor_fds_from_pixmap error in
- glamor_fd_from_pixmap
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net>
-X-Patchwork-Id: 224910
-Message-Id: <20180523094333.11076-2-michel@daenzer.net>
-To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>,
- Daniel Stone <daniels@collabora.com>
-Cc: xorg-devel@lists.x.org
-Date: Wed, 23 May 2018 11:43:33 +0200
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-glamor_fds_from_pixmap returns 0 on error, but we were treating that as
-success, continuing with uninitialized stride and fd values.
-
-Also bail if the offset isn't 0, same as in dri3_fd_from_pixmap.
-
-Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
- BuffersFromPixmap"
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- glamor/glamor.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index e2c74d17a..63f0947fa 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -865,17 +865,15 @@ glamor_fd_from_pixmap(ScreenPtr screen,
- &modifier);
-
- /* Pixmaps with multi-planes/modifier are not supported in this interface */
-- if (ret > 1) {
-- while (ret > 0)
-- close(fds[--ret]);
-- return -1;
-+ if (ret == 1 && offsets[0] == 0) {
-+ *stride = strides[0];
-+ *size = pixmap->drawable.height * *stride;
-+ return fds[0];
- }
-
-- ret = fds[0];
-- *stride = strides[0];
-- *size = pixmap->drawable.height * *stride;
--
-- return ret;
-+ while (ret > 0)
-+ close(fds[--ret]);
-+ return -1;
- }
-
- _X_EXPORT int