From 350c27a4e4c8b4625a88e3e7373c397892835d36 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 24 Oct 2011 14:00:41 -0400
Subject: [PATCH] mesa-7.11-drisw-glx13.patch: Fix GLX 1.3 ctors with swrast
 (#747276)

---
 mesa-7.11-drisw-glx13.patch | 29 +++++++++++++++++++++++++++++
 mesa.spec                   |  7 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 mesa-7.11-drisw-glx13.patch

diff --git a/mesa-7.11-drisw-glx13.patch b/mesa-7.11-drisw-glx13.patch
new file mode 100644
index 0000000..2bd3bad
--- /dev/null
+++ b/mesa-7.11-drisw-glx13.patch
@@ -0,0 +1,29 @@
+From b2fbf8225bfed2d6f5339ba0a97ddbc5e6cc491a Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 28 Apr 2011 08:54:45 -0400
+Subject: [PATCH] drisw: Remove cargo culting that breaks GLX 1.3 ctors
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+(cherry picked from commit d44f821213d7ed67fed18d6ea6c34b61a665c89e)
+---
+ src/glx/drisw_glx.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
+index a57b327..30fe053 100644
+--- a/src/glx/drisw_glx.c
++++ b/src/glx/drisw_glx.c
+@@ -369,10 +369,6 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable,
+ 
+    const __DRIswrastExtension *swrast = psc->swrast;
+ 
+-   /* Old dri can't handle GLX 1.3+ drawable constructors. */
+-   if (xDrawable != drawable)
+-      return NULL;
+-
+    pdp = Xmalloc(sizeof(*pdp));
+    if (!pdp)
+       return NULL;
+-- 
+1.7.6.4
+
diff --git a/mesa.spec b/mesa.spec
index c812d46..2e2c766 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -26,7 +26,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.11
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,6 +48,7 @@ Patch8: mesa-7.10-llvmcore.patch
 Patch30: mesa-7.6-hush-vblank-warning.patch
 Patch31: mesa-7.10-swrastg.patch
 Patch32: mesa-7.11-generic-wmb.patch
+Patch33: mesa-7.11-drisw-glx13.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
@@ -222,6 +223,7 @@ Mesa offscreen rendering development package
 %patch30 -p1 -b .vblank-warning
 #patch31 -p1 -b .swrastg
 %patch32 -p1 -b .wmb
+%patch33 -p1 -b .glx13
 
 %build
 
@@ -460,6 +462,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/osmesa.pc
 
 %changelog
+* Mon Oct 24 2011 Adam Jackson <ajax@redhat.com> 7.11-5
+- mesa-7.11-drisw-glx13.patch: Fix GLX 1.3 ctors with swrast (#747276)
+
 * Fri Sep 09 2011 Adam Jackson <ajax@redhat.com> 7.11-4
 - mesa-7.11-generic-wmb.patch: Add generic write memory barrier macro for
   non-PC arches.