Mesa (9.1): mesa: Note that patch 0967c36 shouldn' t actually get picked to the 9.1 branch

Ian Romanick idr at kemper.freedesktop.org
Fri May 10 20:43:46 UTC 2013


Module: Mesa
Branch: 9.1
Commit: f5887e4d3f40ef8ed12d70db8ca68aa47630f4c4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5887e4d3f40ef8ed12d70db8ca68aa47630f4c4

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri May 10 13:40:56 2013 -0700

mesa: Note that patch 0967c36 shouldn't actually get picked to the 9.1 branch

The code didn't apply cleanly due to a number of refactors, so a
different solution was needed.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>

---

 bin/.cherry-ignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index ae87f9a..32393f3 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -8,3 +8,6 @@ d60da27273d2cdb68bc32cae2ca66718dab15f27 st/mesa: set ctx->Const.MaxSamples = 0,
 
 # This patch is superceded by 7d4f1e6
 dbf94d105a48b7aafb2c8cf64d8b4392d87efea1 glsl: Replace constant-index vector array accesses with swizzles
+
+# This patch is superceded by 34a4fc5
+0967c362bf378b7415c30ca6d9523d3b2a3a7f5d i965: Fix an inconsistency inb the VUE map with gl_ClipVertex on gen4/5.




More information about the mesa-commit mailing list