mesa: Changes to 'ubuntu'
debian/changelog | 9 ++++++
debian/patches/104_savage_init_mesa.patch | 43 ++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 53 insertions(+)
New commits:
commit 2c6f6f5a6bc0a5f2696b9b44eed2347eefb33935
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Apr 21 09:56:31 2010 -0700
CL entry
diff --git a/debian/changelog b/debian/changelog
index a7b359f..9ad83ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.7.1-1ubuntu3) lucid-proposed; urgency=low
+
+ * Add 104_savage_init_mesa.patch: Savage driver needs to initialize
+ &ctx->Meta->Save. Fixes crash when using _mesa_CopyTexImage2D
+ on Savage hardware. Cherrypick from upstream. Thanks Tormod.
+ (LP: #562718)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 21 Apr 2010 09:48:09 -0700
+
mesa (7.7.1-1ubuntu2) lucid; urgency=low
* Add 103_savage-expose_fbmodes_with_nonzero_alpha.patch: Expose
commit ddfbb394615801802295c964ef76e9754fa54f5d
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Apr 21 09:47:54 2010 -0700
Fixes crash when using _mesa_CopyTexImage2D.
diff --git a/debian/patches/104_savage_init_mesa.patch b/debian/patches/104_savage_init_mesa.patch
new file mode 100644
index 0000000..ca838fd
--- /dev/null
+++ b/debian/patches/104_savage_init_mesa.patch
@@ -0,0 +1,43 @@
+From 885048232fb715b0646d52ff35305941a25f1382 Mon Sep 17 00:00:00 2001
+From: Tormod Volden <lists.tormod@gmail.com>
+Date: Thu, 15 Apr 2010 17:13:53 +0000
+Subject: savage: call _mesa_meta_init/free()
+
+Fixes crash when using _mesa_CopyTexImage2D.
+Bug #27652.
+
+Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+Signed-off-by: Brian Paul <brianp@vmware.com>
+---
+diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
+index 6f07ac2..c3a53ea 100644
+--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
++++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
+@@ -44,6 +44,7 @@
+ #include "tnl/t_pipeline.h"
+
+ #include "drivers/common/driverfuncs.h"
++#include "drivers/common/meta.h"
+
+ #include "savagedd.h"
+ #include "savagestate.h"
+@@ -473,6 +474,8 @@ savageCreateContext( const __GLcontextModes *mesaVis,
+ imesa->CurrentTexObj[0] = 0;
+ imesa->CurrentTexObj[1] = 0;
+
++ _mesa_meta_init( ctx );
++
+ /* Initialize the software rasterizer and helper modules.
+ */
+ _swrast_CreateContext( ctx );
+@@ -564,6 +567,8 @@ savageDestroyContext(__DRIcontext *driContextPriv)
+ free(imesa->cmdBuf.base);
+ free(imesa->clientVtxBuf.buf);
+
++ _mesa_meta_free( imesa->glCtx );
++
+ _swsetup_DestroyContext(imesa->glCtx );
+ _tnl_DestroyContext( imesa->glCtx );
+ _vbo_DestroyContext( imesa->glCtx );
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index 8a6809d..7c57190 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
102_dont_vblank.diff
107_glxgears_is_not_a_benchmark.patch
103_savage-expose_fbmodes_with_nonzero_alpha.patch
+104_savage_init_mesa.patch
Reply to: