diff -u mesa-10.1.0/debian/changelog mesa-10.1.0/debian/changelog --- mesa-10.1.0/debian/changelog +++ mesa-10.1.0/debian/changelog @@ -1,3 +1,10 @@ +mesa (10.1.0-4ubuntu5) trusty; urgency=medium + + * enable-bdw.diff: Enable Broadwell support. (LP: #1300258) + * fix-unity-on-bdw.diff: Fix rendering on unity. + + -- Timo Aaltonen Mon, 14 Apr 2014 09:59:17 +0300 + mesa (10.1.0-4ubuntu4) trusty; urgency=medium * Cherry-pick patches to improve stability with vmware. (LP: #1284134) diff -u mesa-10.1.0/debian/patches/series mesa-10.1.0/debian/patches/series --- mesa-10.1.0/debian/patches/series +++ mesa-10.1.0/debian/patches/series @@ -18,0 +19,2 @@ +enable-bdw.diff +fix-unity-on-bdw.diff only in patch2: unchanged: --- mesa-10.1.0.orig/debian/patches/enable-bdw.diff +++ mesa-10.1.0/debian/patches/enable-bdw.diff @@ -0,0 +1,26 @@ +commit 1336ccb7dd63b64ef5d8bb0a7f57d6291b0f3a97 +Author: Kenneth Graunke +Date: Mon Dec 30 22:07:20 2013 -0800 + + i965: Enable Broadwell support. + + Signed-off-by: Kenneth Graunke + Reviewed-by: Eric Anholt + +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 only in patch2: unchanged: --- mesa-10.1.0.orig/debian/patches/fix-unity-on-bdw.diff +++ mesa-10.1.0/debian/patches/fix-unity-on-bdw.diff @@ -0,0 +1,39 @@ +commit 227049098b59bca88883a750602fdad41949c996 +Author: Kenneth Graunke +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 + Reviewed-by: Eric Anholt + Tested-by: James Ausmus + Tested-by: Timo Aaltonen + +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, + },