mesa: Changes to 'ubuntu'
debian/changelog | 9 +++++
debian/patches/110_null_ptr_during_screen_tear_down.patch | 23 ++++++++++++
debian/patches/111_fix_mesa_ref_fb_call_syntax.patch | 25 ++++++++++++++
debian/patches/series | 2 +
4 files changed, 59 insertions(+)
New commits:
commit 2fa00e744dedfdd639b6f6c16de1c77a88eb76ad
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Jun 24 15:08:42 2009 -0700
Adding patches 110 and 111 to fix crash caused by previous memory
leak fixes.
diff --git a/debian/changelog b/debian/changelog
index 708ebf0..fa6e943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.4.1-1ubuntu4~bug391808~1) karmic; urgency=low
+
+ * Add 110_null_ptr_during_screen_tear_down.patch and
+ 111_fix_mesa_ref_fb_call_syntax.patch to fix crashes caused by errors
+ in the previous memory leak fixes in -1u3.
+ (LP: #391808)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 24 Jun 2009 15:06:02 -0700
+
mesa (7.4.1-1ubuntu3) karmic; urgency=low
* Add 108_destroy_intel_fb.patch: Release fb backing regions in
diff --git a/debian/patches/110_null_ptr_during_screen_tear_down.patch b/debian/patches/110_null_ptr_during_screen_tear_down.patch
new file mode 100644
index 0000000..23761a6
--- /dev/null
+++ b/debian/patches/110_null_ptr_during_screen_tear_down.patch
@@ -0,0 +1,23 @@
+From 1dbbc39f48ce5f9aa63ab42930b14e48938b326f Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Mon, 22 Jun 2009 17:23:30 +0000
+Subject: intel: added a null ptr check
+
+This was hit during screen tear-down.
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
+index 54f6038..5a1314e 100644
+--- a/src/mesa/drivers/dri/intel/intel_fbo.c
++++ b/src/mesa/drivers/dri/intel/intel_fbo.c
+@@ -345,7 +345,8 @@ intel_renderbuffer_set_region(struct intel_renderbuffer *rb,
+ intel_region_reference(&rb->region, region);
+ intel_region_release(&old);
+
+- rb->pfPitch = region->pitch;
++ if (region)
++ rb->pfPitch = region->pitch;
+ }
+
+ /**
+--
+cgit v0.8.2
diff --git a/debian/patches/111_fix_mesa_ref_fb_call_syntax.patch b/debian/patches/111_fix_mesa_ref_fb_call_syntax.patch
new file mode 100644
index 0000000..95e87c2
--- /dev/null
+++ b/debian/patches/111_fix_mesa_ref_fb_call_syntax.patch
@@ -0,0 +1,25 @@
+From 4b8cd0b0ad48c3b0129451924f7461ffcbbc8597 Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Mon, 22 Jun 2009 17:23:13 +0000
+Subject: intel: call _mesa_unreference_framebuffer() in intelDestroyBuffer()
+
+This was a call to _mesa_reference_framebuffer(ptr, NULL) but the NULL
+pointer is incorrect in Mesa 7.4.x.
+
+Fixes a failed assertion during screen tear-down.
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 59fa54f..8d2a3a7 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -409,7 +409,7 @@ intelDestroyBuffer(__DRIdrawablePrivate * driDrawPriv)
+ }
+ }
+
+- _mesa_reference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
++ _mesa_unreference_framebuffer((GLframebuffer **)(&(driDrawPriv->driverPrivate)));
+ }
+
+
+--
+cgit v0.8.2
diff --git a/debian/patches/series b/debian/patches/series
index 90f2155..676e92d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,5 @@
107_glxgears_is_not_a_benchmark.patch
108_destroy_intel_fb.patch
109_release_direct_rendering_resources.patch
+110_null_ptr_during_screen_tear_down.patch
+111_fix_mesa_ref_fb_call_syntax.patch
Reply to: