summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2017-06-23 02:14:24 +0300
committerAndres Gomez <agomez@igalia.com>2017-06-28 20:17:13 +0300
commit02b5d52bc3d6a8c1eeab7670d36551cc56e92d8c (patch)
tree23d1fe9b1de41036fc81f69268982bdc276d3633
parent0069a613ac3b6ca75315cbb2fd3d86b0f6c9ede4 (diff)
cherry-ignore: 17.1.4 rejected commits
stable: rejected commits. Signed-off-by: Andres Gomez <agomez@igalia.com>
-rw-r--r--bin/.cherry-ignore9
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index fc9bf3672ee..936e57021b0 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -1,4 +1,11 @@
-# This commit depends on 9fd9a7d0ba3 and 678d568c7b2, neither of which is in branch.
+# stable: This commit depends on 9fd9a7d0ba3 and 678d568c7b2, neither
+# of which is in branch.
b84b631c6381d9b36bca5d0e7cc67dd23af188c1 radeonsi: load patch_id for TES-as-ES when exporting for PS
# This commit addressed an earlier commit 126d5ad which did not land in branch.
9da104593386f6e8ddec8f0d9d288aceb8908fe1 radv: fix regression in descriptor set freeing.
+# stable: This commit addressed an earlier commit 944455217b which did
+# not land in branch.
+b28938ffce0580e89e6012826900da2b6013b0df st/glsl_to_tgsi: use correct writemask when converting generic intrinsics
+# stable: This commit depends on 330d0607e and 61d8f3387d, neither of
+# which is in branch.
+c12f8305a8ae4fd5d78a9ab8bbda790a711d5bed nv50,nvc0: remove IDX from bufctx immediately, to avoid conflicts with clear