hack to fix GLX_MESA_copy_sub_buffer regression (#1265395)
This commit is contained in:
parent
a6e073b5bf
commit
0307fa93a6
@ -0,0 +1,42 @@
|
|||||||
|
From cfe51b7b536cf9f46e26cae97d9560c8c4264009 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fedora X Ninjas <x@fedoraproject.org>
|
||||||
|
Date: Tue, 22 Sep 2015 20:20:04 -0400
|
||||||
|
Subject: [PATCH] glx: fix regression with copy sub buffer disappearing
|
||||||
|
|
||||||
|
So copy sub buffer isn't a core extensions it's a driver extension
|
||||||
|
which means we are using totally the wrong interface to query for it
|
||||||
|
here, which means bad things happen when you roll out this code,
|
||||||
|
for instance MESA_copy_sub_buffer stops working.
|
||||||
|
|
||||||
|
This is just the hack I'm sticking in Fedora to avoid the regression
|
||||||
|
for now, but hopefully will inspire us.
|
||||||
|
---
|
||||||
|
glx/glxdriswrast.c | 5 +++--
|
||||||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
|
||||||
|
index 9add2a1..e8e53bf 100644
|
||||||
|
--- a/glx/glxdriswrast.c
|
||||||
|
+++ b/glx/glxdriswrast.c
|
||||||
|
@@ -396,6 +396,9 @@ initializeExtensions(__GLXDRIscreen * screen)
|
||||||
|
const __DRIextension **extensions;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
+ __glXEnableExtension(screen->glx_enable_bits, "GLX_MESA_copy_sub_buffer");
|
||||||
|
+ LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
|
||||||
|
+
|
||||||
|
if (screen->swrast->base.version >= 3) {
|
||||||
|
__glXEnableExtension(screen->glx_enable_bits,
|
||||||
|
"GLX_ARB_create_context");
|
||||||
|
@@ -416,8 +419,6 @@ initializeExtensions(__GLXDRIscreen * screen)
|
||||||
|
if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
|
||||||
|
screen->copySubBuffer =
|
||||||
|
(const __DRIcopySubBufferExtension *) extensions[i];
|
||||||
|
- __glXEnableExtension(screen->glx_enable_bits,
|
||||||
|
- "GLX_MESA_copy_sub_buffer");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
|
||||||
|
--
|
||||||
|
2.5.0
|
||||||
|
|
@ -45,7 +45,7 @@
|
|||||||
Summary: X.Org X11 X server
|
Summary: X.Org X11 X server
|
||||||
Name: xorg-x11-server
|
Name: xorg-x11-server
|
||||||
Version: 1.18.0
|
Version: 1.18.0
|
||||||
Release: 0.2%{?gitdate:.%{gitdate}}%{dist}
|
Release: 0.3%{?gitdate:.%{gitdate}}%{dist}
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
@ -77,6 +77,9 @@ Source31: xserver-sdk-abi-requires.git
|
|||||||
# maintainer convenience script
|
# maintainer convenience script
|
||||||
Source40: driver-abi-rebuild.sh
|
Source40: driver-abi-rebuild.sh
|
||||||
|
|
||||||
|
# hack that isn't upstream - hopefully upstream fixes nicer
|
||||||
|
Patch3000: 0001-glx-fix-regression-with-copy-sub-buffer-disappearing.patch
|
||||||
|
|
||||||
Patch4000: 0001-fix-Xdmx-link-harder.patch
|
Patch4000: 0001-fix-Xdmx-link-harder.patch
|
||||||
# Trivial things to never merge upstream ever:
|
# Trivial things to never merge upstream ever:
|
||||||
# This really could be done prettier.
|
# This really could be done prettier.
|
||||||
@ -631,6 +634,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 22 2015 Dave Airlie <airlied@redhat.com> 1.18.0-0.3
|
||||||
|
- hack to fix GLX_MESA_copy_sub_buffer regression (#1265395)
|
||||||
|
|
||||||
* Mon Sep 07 2015 Dave Airlie <airlied@redhat.com> 1.18.0-0.2
|
* Mon Sep 07 2015 Dave Airlie <airlied@redhat.com> 1.18.0-0.2
|
||||||
- update to git snapshot of 1.7.99 (1.18.0 rc1)
|
- update to git snapshot of 1.7.99 (1.18.0 rc1)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user