mesa: Changes to 'ubuntu'
debian/changelog | 8 ++
debian/control | 1
debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff | 30 ++++++++++
debian/patches/series | 1
4 files changed, 40 insertions(+)
New commits:
commit 993161693815cf6961a0591ac92ae68542f371c3
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jan 19 19:02:23 2017 +0200
release to zesty
diff --git a/debian/changelog b/debian/changelog
index 0ca469d..22ccfe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (13.0.3-1ubuntu3) UNRELEASED; urgency=medium
+mesa (13.0.3-1ubuntu3) zesty; urgency=medium
* control: Add dh-autoreconf back to build-deps, for backports.
* radeonsi-always-leave-poly-offset-in-a-valid-state.diff:
Fix fdo#99451.
- -- Timo Aaltonen <tjaalton@debian.org> Thu, 19 Jan 2017 18:58:15 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 19 Jan 2017 18:59:24 +0200
mesa (13.0.3-1ubuntu2) zesty; urgency=medium
commit 5213d54f20aba63438abfb734406a39ddd8c4f1d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jan 19 18:35:12 2017 +0200
radeonsi-always-leave-poly-offset-in-a-valid-state.diff: Fix fdo#99451.
diff --git a/debian/changelog b/debian/changelog
index 8a937ad..0ca469d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
mesa (13.0.3-1ubuntu3) UNRELEASED; urgency=medium
* control: Add dh-autoreconf back to build-deps, for backports.
+ * radeonsi-always-leave-poly-offset-in-a-valid-state.diff:
+ Fix fdo#99451.
-- Timo Aaltonen <tjaalton@debian.org> Thu, 19 Jan 2017 18:58:15 +0200
diff --git a/debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff b/debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff
new file mode 100644
index 0000000..d757e53
--- /dev/null
+++ b/debian/patches/radeonsi-always-leave-poly-offset-in-a-valid-state.diff
@@ -0,0 +1,30 @@
+commit d7d32b3bfe86bd89d94d59393907bce1cb9dab7c
+Author: Zachary Michaels <zmichaels@oblong.com>
+Date: Thu Jan 19 10:50:16 2017 +0100
+
+ radeonsi: Always leave poly_offset in a valid state
+
+ This commit makes si_update_poly_offset set poly_offset to NULL if
+ uses_poly_offset is false. This way poly_offset either points into the
+ currently queued rasterizer, or it is NULL.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99451
+ Cc: "13.0 17.0" <mesa-stable@lists.freedesktop.org>
+ Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
+
+diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
+index f60a499..0ec34f9 100644
+--- a/src/gallium/drivers/radeonsi/si_state.c
++++ b/src/gallium/drivers/radeonsi/si_state.c
+@@ -717,8 +717,10 @@ static void si_update_poly_offset_state(struct si_context *sctx)
+ {
+ struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
+
+- if (!rs || !rs->uses_poly_offset || !sctx->framebuffer.state.zsbuf)
++ if (!rs || !rs->uses_poly_offset || !sctx->framebuffer.state.zsbuf) {
++ si_pm4_bind_state(sctx, poly_offset, NULL);
+ return;
++ }
+
+ /* Use the user format, not db_render_format, so that the polygon
+ * offset behaves as expected by applications.
diff --git a/debian/patches/series b/debian/patches/series
index f0270f3..efe1e03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ i915-dont-default-to-2.1.patch
0006-intel-blorp_blit-Enable-splitting-large-blorp-blits.patch
0007-intel-blorp_blit-Add-split_blorp_blit_debug-switch.patch
0008-i965-Increase-max-texture-to-16k-for-gen7.patch
+radeonsi-always-leave-poly-offset-in-a-valid-state.diff
commit b71ec237aa52f55a10d6da5b6af175ffb4fa0b14
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jan 19 18:58:18 2017 +0200
control: Add dh-autoreconf back to build-deps, for backports.
diff --git a/debian/changelog b/debian/changelog
index 62c262d..8a937ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (13.0.3-1ubuntu3) UNRELEASED; urgency=medium
+
+ * control: Add dh-autoreconf back to build-deps, for backports.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 19 Jan 2017 18:58:15 +0200
+
mesa (13.0.3-1ubuntu2) zesty; urgency=medium
* rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already.
diff --git a/debian/control b/debian/control
index f500c7b..798148e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Andreas Boll <andreas.boll.dev@gmail.com>
Standards-Version: 3.9.8
Build-Depends:
debhelper (>= 10),
+ dh-autoreconf,
quilt (>= 0.40),
pkg-config,
libdrm-dev (>= 2.4.69) [!hurd-any],
Reply to: