summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-10-31 18:47:21 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2016-11-08 16:23:22 +0000
commit3a27b813b449eb6ec2e41a9b646af1953f002783 (patch)
tree323c7d87aeec726465d252b42c4be0111250b82b /bin
parentac3abe534bb9986ce7ee1286854a3bb2a83568bc (diff)
cherry-ignore: add ClientWaitSync fixes
Patches (and extension overall) depends on gallium API and driver work which hasn't landed in branch. Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'bin')
-rw-r--r--bin/.cherry-ignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 227b21da625..005e1e38460 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -20,3 +20,6 @@ f2b9b0c730e345bcffa9eadabb25af3ab02642f2 i965: Add missing BRW_NEW_FS_PROG_DATA
# The commit in question hasn't landed in branch
1ef787339774bc7f1cc9c1615722f944005e070c Revert "egl/android: Set EGL_MAX_PBUFFER_WIDTH and EGL_MAX_PBUFFER_HEIGHT"
+# Patches depend on the fence_finish() gallium API change and corresponding driver work
+f240ad98bc05281ea7013d91973cb5f932ae9434 st/mesa: unduplicate st_check_sync code
+b687f766fddb7b39479cd9ee0427984029ea3559 st/mesa: allow multiple concurrent waiters in ClientWaitSync