From ef75bf0777fa3de4012899b8ee12e21e4a07ed1f Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 28 Jan 2014 13:16:25 -0800 Subject: [PATCH] Drop another couple of patches. These depend on code which does not exist on the stable branch. --- bin/.cherry-ignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 7fc4ab00353..5aacaafd957 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -22,3 +22,8 @@ f5cfb4ae21df8eebfc6b86c0ce858b1c0a9160dd i965: Ignore 'centroid' interpolation q # Picking it would require at least also picking: # 73c3c7e3, 3e0e9e3b, c59a605c b2d1c579bb84a88179072a6a783f8827e218db55 glcpp: Set extension defines after resolving the GLSL version. + +# These patches depend on other code not in stable branch. +# (at least 3b22146dc714b6090f7423abbc4df53d7d1fdaa9) +e190709119d8eb85c67bfbad5be699d39ad0118e mesa: Ensure that transform feedback refers to the correct program. +43e77215b13b2f86e461cd8a62b542fc6854dd1c i965/gen7: Use to the correct program when uploading transform feedback state. \ No newline at end of file