[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'ubuntu'



 debian/changelog                                   |    9 +++++++++
 debian/patches/106_fix_renderbuffer_segfault.patch |   16 ++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 26 insertions(+)

New commits:
commit cf4a8ec1a0ae9a576db12ea07851b810955d6fd5
Author: Bryce Harrington <bryce@canonical.com>
Date:   Thu Dec 2 17:12:56 2010 -0800

    Fix for compiz/radeon crash when resizing windows

diff --git a/debian/changelog b/debian/changelog
index ee3fb32..6d7ead5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.9+repack-1ubuntu3) natty; urgency=low
+
+  * debian/patches/106_fix_renderbuffer_segfault.patch:
+    - Cherrypick of 9b1ac4d1 from 7.9 branch to fix segfault in
+      renderbuffer update that occurs in Compiz while resizing windows,
+      giving the error message "failed to attach dri2 front buffer XX"
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 02 Dec 2010 16:57:03 -0800
+
 mesa (7.9+repack-1ubuntu2) natty; urgency=low
 
   * debian/patches/105_use_shared_libdricore.patch:
diff --git a/debian/patches/106_fix_renderbuffer_segfault.patch b/debian/patches/106_fix_renderbuffer_segfault.patch
new file mode 100644
index 0000000..3ddb89a
--- /dev/null
+++ b/debian/patches/106_fix_renderbuffer_segfault.patch
@@ -0,0 +1,16 @@
+diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
+index b0340ce..9b44801 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
++++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
+@@ -731,10 +731,10 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable,
+ 						buffers[i].flags);
+ 
+ 			if (bo == NULL) {
+-
+ 				fprintf(stderr, "failed to attach %s %d\n",
+ 					regname, buffers[i].name);
+ 
++				continue;
+ 			}
+ 
+ 			ret = radeon_bo_get_tiling(bo, &tiling_flags, &pitch);
diff --git a/debian/patches/series b/debian/patches/series
index cb9a4c5..8402459 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 103_savage-expose_fbmodes_with_nonzero_alpha.patch
 104_i915_fragment_shader_disable.patch
 105_use_shared_libdricore.patch
+106_fix_renderbuffer_segfault.patch


Reply to: