From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 14 Jan 2016 17:42:50 +0000 (+0200)
Subject: cherry-ignore: add the dri3 glx null check patch
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fc315a53c69db1535b4e4f84b71f8061e5c17221;p=android-x86%2Fexternal-mesa.git

cherry-ignore: add the dri3 glx null check patch

The branch (which is at state prior to the dri3 loader rework), already
includes the check.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 3c9c4f5c422..370a31259b2 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -9,3 +9,6 @@
 
 # already picked as commit 94ac4b3e84737b8c5faa371834670fd25502e024
 b5b87c4ed1dfd58aec8905e0514c9ba92ba83e1d r600g: write all MRTs only if there is exactly one output (fixes a hang)
+
+# patch not applicable on branch (null check already exists)
+f7b71451231c75c36771e8b7b0d78f05e0d50f65 glx/dri3: a drawable might not be bound at wait time