diff options
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 |
commit | 16c26916c02e8f062fc4cdf8fbb8f5be9b204093 (patch) | |
tree | 02357ef1554a0f6862af5b549fdf25cdeb3ccb4d /source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch | |
parent | 2f3a6405501b3de32999677153f1bcb2f96b74ed (diff) | |
download | current-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-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch')
-rw-r--r-- | source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch b/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch deleted file mode 100644 index 32672f2b5..000000000 --- a/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch +++ /dev/null @@ -1,54 +0,0 @@ -From patchwork Wed May 23 09:43:32 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [xserver, - 1/2] glamor: Always return 0 from glamor_fds_from_pixmap on error -From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net> -X-Patchwork-Id: 224909 -Message-Id: <20180523094333.11076-1-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:32 +0200 - -From: Michel Dänzer <michel.daenzer@amd.com> - -This matches what glamor_egl_fds_from_pixmap and dri3_fds_from_pixmap do -and what proc_dri3_buffers_from_pixmap expects. - -Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and - BuffersFromPixmap" -Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> ---- - glamor/glamor.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/glamor/glamor.c b/glamor/glamor.c -index d984d20f3..e2c74d17a 100644 ---- a/glamor/glamor.c -+++ b/glamor/glamor.c -@@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds, - glamor_get_screen_private(pixmap->drawable.pScreen); - - if (!glamor_priv->dri3_enabled) -- return -1; -+ return 0; - switch (pixmap_priv->type) { - case GLAMOR_TEXTURE_DRM: - case GLAMOR_TEXTURE_ONLY: - if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ? - GL_RGB10_A2 : GL_RGBA, 0)) -- return -1; -+ return 0; - return glamor_egl_fds_from_pixmap(screen, pixmap, fds, - strides, offsets, - modifier); - default: - break; - } -- return -1; -+ return 0; - } - - _X_EXPORT int |