mesa: Changes to 'ubuntu'
debian/changelog | 13 ++++
debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch | 29 ++++++++++
debian/patches/series | 1
3 files changed, 43 insertions(+)
New commits:
commit c42a7480b28c1b9eb652d3262c2acd00454c49a1
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jul 10 14:06:44 2015 +0300
release to wily
diff --git a/debian/changelog b/debian/changelog
index c1bff45..4677962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.5.9-2ubuntu1) wily; urgency=medium
+
+ * Merge from Debian unstable.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 10 Jul 2015 14:02:38 +0300
+
mesa (10.5.9-2) unstable; urgency=medium
* i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression
commit 7ced45cd145fdbea4403dac5896ad79b9fc64582
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jul 10 13:02:07 2015 +0300
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 2767303..3a5b275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.5.9-2) UNRELEASED; urgency=medium
+mesa (10.5.9-2) unstable; urgency=medium
* i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression
since 10.5.5, allow using blit fastpath again.
- -- Timo Aaltonen <tjaalton@debian.org> Fri, 10 Jul 2015 13:01:13 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 10 Jul 2015 13:01:40 +0300
mesa (10.5.9-1) unstable; urgency=medium
commit 799eeaa9becbb872d68ed9ffbb16612839449044
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jul 10 13:01:21 2015 +0300
i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression since 10.5.5, allow using blit fastpath again.
diff --git a/debian/changelog b/debian/changelog
index 080d6f0..2767303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.5.9-2) UNRELEASED; urgency=medium
+
+ * i965-do_blit_drawpixels-decode-array-formats.patch: Fix a regression
+ since 10.5.5, allow using blit fastpath again.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 10 Jul 2015 13:01:13 +0300
+
mesa (10.5.9-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch b/debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch
new file mode 100644
index 0000000..5808155
--- /dev/null
+++ b/debian/patches/i965-do_blit_drawpixels-decode-array-formats.patch
@@ -0,0 +1,29 @@
+commit bd38f91f8d80897ca91979962d80d4bc0acef586
+Author: Alexander Monakov <amonakov@gmail.com>
+Date: Tue Jun 9 20:58:22 2015 +0300
+
+ i965: do_blit_drawpixels: decode array formats
+
+ Correct a regression introduced by commit 922c0c9fd526 by converting "array
+ format", if received from _mesa_format_from_format_and_type, to mesa_format.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=90839
+ Signed-off-by: Alexander Monakov <amonakov@gmail.com>
+ Tested-by: AnAkkk <anakin.cs@gmail.com>
+ Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
+ Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
+ Cc: mesa-stable@lists.freedesktop.org
+
+diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+index d68cbb6..189a592 100644
+--- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c
++++ b/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+@@ -78,6 +78,8 @@ do_blit_drawpixels(struct gl_context * ctx,
+ struct intel_renderbuffer *irb = intel_renderbuffer(rb);
+
+ mesa_format src_format = _mesa_format_from_format_and_type(format, type);
++ if (_mesa_format_is_mesa_array_format(src_format))
++ src_format = _mesa_format_from_array_format(src_format);
+ mesa_format dst_format = irb->mt->format;
+
+ /* We can safely discard sRGB encode/decode for the DrawPixels interface */
diff --git a/debian/patches/series b/debian/patches/series
index 9f0749f..11e1fc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
07_gallium-fix-build-failure-on-powerpcspe.diff
+i965-do_blit_drawpixels-decode-array-formats.patch
Reply to: