mesa: Changes to 'ubuntu+1'
debian/changelog | 2 ++
debian/patches/series | 3 +++
debian/patches/vbo-fix-crash.diff | 29 +++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
New commits:
commit 304a86694e531ed9980cb761762f93c662fd4304
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Apr 8 09:47:33 2013 +0300
vbo-fix-crash.diff: Patch from the stable tree that fixes a crasher with shared display lists.
diff --git a/debian/changelog b/debian/changelog
index c0f735e..7c8652a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
* Merge from unreleased debian git
- new upstream release (LP: #1112147)
* Added a bunch of patches to fix slow blur on intel.
+ * vbo-fix-crash.diff: Patch from the stable tree that fixes a crasher
+ with shared display lists.
[ Maarten Lankhorst ]
* Add some more patches to fix image copy regressions on nouveau.
diff --git a/debian/patches/series b/debian/patches/series
index f2a4e13..bd5bfc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,7 +35,10 @@ i965-specialize-surface_state-creation.diff
0010-i965-fs-Don-t-double-emit-SEND-dependency-workaround.patch
0011-i965-fs-Use-LD-messages-for-pre-gen7-varying-index-u.patch
0012-i965-fs-Allow-CSE-on-pre-gen7-varying-index-uniform-.patch
+
0001-nv50-fix-3D-render-target-setup.patch
0002-nv50-nvc0-disable-DEPTH_RANGE_NEAR-FAR-clipping-duri.patch
0003-nv50-nvc0-fix-3d-blits-restore-viewport-after-blit.patch
0004-nvc0-fix-for-2d-engine-R-source-formats-writing-RRR1.patch
+
+vbo-fix-crash.diff
diff --git a/debian/patches/vbo-fix-crash.diff b/debian/patches/vbo-fix-crash.diff
new file mode 100644
index 0000000..03b52b2
--- /dev/null
+++ b/debian/patches/vbo-fix-crash.diff
@@ -0,0 +1,29 @@
+commit e6616948b74531eae3137585b3ae35a1fc0f8174
+Author: Brian Paul <brianp@vmware.com>
+Date: Wed Mar 6 12:08:17 2013 -0700
+
+ vbo: fix crash found with shared display lists
+
+ This fixes a crash when a display list is created in one context
+ but executed from a second one. The vbo_save_context::vertex_store
+ memeber will be NULL if we never created a display list with the
+ context. Just check for that before dereferencing the pointer.
+
+ Fixes http://bugzilla.redhat.com/show_bug.cgi?id=918661
+
+ Note: This is a candidate for the stable branches.
+ (cherry picked from commit c2665aacdd14beec9580246736c602e3ff04d7ae)
+
+diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
+index efb386e..f5b5c41 100644
+--- a/src/mesa/vbo/vbo_save_draw.c
++++ b/src/mesa/vbo/vbo_save_draw.c
+@@ -253,7 +253,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data)
+ struct vbo_save_context *save = &vbo_context(ctx)->save;
+ GLboolean remap_vertex_store = GL_FALSE;
+
+- if (save->vertex_store->buffer) {
++ if (save->vertex_store && save->vertex_store->buffer) {
+ /* The vertex store is currently mapped but we're about to replay
+ * a display list. This can happen when a nested display list is
+ * being build with GL_COMPILE_AND_EXECUTE.
Reply to: