mesa: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/patches/108_bo_assertion.patch | 27 +++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 35 insertions(+)
New commits:
commit ba96f091ec2b6b6cd6b386d193a1aab5885cc71b
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Jul 7 12:22:46 2009 -0700
Patch from Sarvatt to fix #396667
diff --git a/debian/changelog b/debian/changelog
index d60cbce..adfc81f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.5~rc4-1ubuntu3) karmic; urgency=low
+
+ * Add 108_bo_assertion.patch: Fix assertion failure on remapping a
+ non-BO-backed VBO with intel video. (LP: #396667)
+
+ -- Robert Hooker (Sarvatt) <sarvatt@gmail.com> Tue, 07 Jul 2009 14:35:54 -0400
+
mesa (7.5~rc4-1ubuntu2) karmic; urgency=low
* rules: Add a missing semicolon (FTBFS).
diff --git a/debian/patches/108_bo_assertion.patch b/debian/patches/108_bo_assertion.patch
new file mode 100644
index 0000000..7533a4b
--- /dev/null
+++ b/debian/patches/108_bo_assertion.patch
@@ -0,0 +1,27 @@
+From c72261f2a886e1f53025c2cf4b38b33ccfd62857 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Tue, 30 Jun 2009 01:48:27 +0000
+Subject: i915: Fix assertion failure on remapping a non-BO-backed VBO.
+
+Failure to set the obj->Pointer back to null tripped up the assertion.
+Bug #22428.
+(cherry picked from commit 57a06d3a48c9af1067ec05e3ad96c58f4b9b99be)
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+index c31fe91..2e6b778 100644
+--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
++++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+@@ -265,7 +265,10 @@ intel_bufferobj_unmap(GLcontext * ctx,
+ struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
+
+ assert(intel_obj);
+- if (intel_obj->buffer != NULL) {
++ if (intel_obj->sys_buffer != NULL) {
++ assert(obj->Pointer);
++ obj->Pointer = NULL;
++ } else if (intel_obj->buffer != NULL) {
+ assert(obj->Pointer);
+ if (intel_obj->mapped_gtt) {
+ drm_intel_gem_bo_unmap_gtt(intel_obj->buffer);
+--
+cgit v0.8.2
diff --git a/debian/patches/series b/debian/patches/series
index 205e50c..d5ef2e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
101_ubuntu_hidden_glname.patch
102_dont_vblank.diff
107_glxgears_is_not_a_benchmark.patch
+108_bo_assertion.patch
Reply to: