mesa: Changes to 'ubuntu'
debian/patches/enable-bdw.diff | 26 +++++++++++++++++++++++
debian/patches/fix-unity-on-bdw.diff | 39 +++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
New commits:
commit 79db77fdcbd7745066c4a3848bd13c0630e4d3ec
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Sat Apr 12 11:09:35 2014 +0300
don't forget the patches
diff --git a/debian/patches/enable-bdw.diff b/debian/patches/enable-bdw.diff
new file mode 100644
index 0000000..e46f346
--- /dev/null
+++ b/debian/patches/enable-bdw.diff
@@ -0,0 +1,26 @@
+commit 1336ccb7dd63b64ef5d8bb0a7f57d6291b0f3a97
+Author: Kenneth Graunke <kenneth@whitecape.org>
+Date: Mon Dec 30 22:07:20 2013 -0800
+
+ i965: Enable Broadwell support.
+
+ Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
+index a5091b9..a71f6d4 100644
+--- a/include/pci_ids/i965_pci_ids.h
++++ b/include/pci_ids/i965_pci_ids.h
+@@ -91,7 +91,6 @@ CHIPSET(0x0F32, byt, "Intel(R) Bay Trail")
+ CHIPSET(0x0F33, byt, "Intel(R) Bay Trail")
+ CHIPSET(0x0157, byt, "Intel(R) Bay Trail")
+ CHIPSET(0x0155, byt, "Intel(R) Bay Trail")
+-#ifdef INTEL_PRELIMINARY_HW_SUPPORT
+ CHIPSET(0x1602, bdw_gt1, "Intel(R) Broadwell")
+ CHIPSET(0x1606, bdw_gt1, "Intel(R) Broadwell")
+ CHIPSET(0x160A, bdw_gt1, "Intel(R) Broadwell")
+@@ -110,4 +109,3 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Broadwell")
+ CHIPSET(0x162B, bdw_gt3, "Intel(R) Broadwell")
+ CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell")
+ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell")
+-#endif
diff --git a/debian/patches/fix-unity-on-bdw.diff b/debian/patches/fix-unity-on-bdw.diff
new file mode 100644
index 0000000..a907f44
--- /dev/null
+++ b/debian/patches/fix-unity-on-bdw.diff
@@ -0,0 +1,39 @@
+commit 227049098b59bca88883a750602fdad41949c996
+Author: Kenneth Graunke <kenneth@whitecape.org>
+Date: Wed Apr 9 22:54:11 2014 -0700
+
+ i965: Fix missing _NEW_SCISSOR in Broadwell SF_CLIP_VIEWPORT state.
+
+ The _Xmin/_Xmax/_Ymin/_Ymax values need to be guarded by _NEW_SCISSOR.
+
+ Fixes Piglit's scissor-many, and rendering in GNOME Shell.
+ Hopefully fixes similar issues with Unity and ChromeOS.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75879
+ Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Tested-by: James Ausmus <james.ausmus@intel.com>
+ Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
+
+diff --git a/src/mesa/drivers/dri/i965/gen8_viewport_state.c b/src/mesa/drivers/dri/i965/gen8_viewport_state.c
+index 344310e..b366246 100644
+--- a/src/mesa/drivers/dri/i965/gen8_viewport_state.c
++++ b/src/mesa/drivers/dri/i965/gen8_viewport_state.c
+@@ -86,7 +86,7 @@ gen8_upload_sf_clip_viewport(struct brw_context *brw)
+ vp[10] = -gby; /* y-min */
+ vp[11] = gby; /* y-max */
+
+- /* Screen Space Viewport */
++ /* _NEW_SCISSOR | _NEW_VIEWPORT | _NEW_BUFFERS: Screen Space Viewport */
+ if (render_to_fbo) {
+ vp[12] = ctx->DrawBuffer->_Xmin;
+ vp[13] = ctx->DrawBuffer->_Xmax - 1;
+@@ -110,7 +110,7 @@ gen8_upload_sf_clip_viewport(struct brw_context *brw)
+
+ const struct brw_tracked_state gen8_sf_clip_viewport = {
+ .dirty = {
+- .mesa = _NEW_VIEWPORT | _NEW_BUFFERS,
++ .mesa = _NEW_BUFFERS | _NEW_SCISSOR | _NEW_VIEWPORT,
+ .brw = BRW_NEW_BATCH,
+ .cache = 0,
+ },
Reply to: