commit 7bc40ff82e2be8046b38bc26ca954b441ac26054
author Nicolas Capens <capn@google.com> Fri Jan 06 09:41:21 2017 -0500
committer Nicolas Capens <capn@google.com> Fri Jan 06 15:21:35 2017 +0000
tree b8c05b38ad5d6ef4c874a95df7d780f45e4d97c4
parent b28c662c82c7ac74962cb12a5d9f5bde2e650032

Only add non-conformant configs on Android.

This silences a benign assert in the config sorting operator which
checks for unique configs. On platforms other than Android, all of the
configs are marked as conformant.

Bug b/34029810

Change-Id: I600d67747ba24f153a0316609e5a783991093ebd
Reviewed-on: https://swiftshader-review.googlesource.com/8388
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/OpenGL/libEGL/Config.cpp

diff --git a/src/OpenGL/libEGL/Config.cpp b/src/OpenGL/libEGL/Config.cpp
index e93819e..80c36c8 100644
--- a/src/OpenGL/libEGL/Config.cpp
+++ b/src/OpenGL/libEGL/Config.cpp
@@ -336,8 +336,10 @@
 	Config conformantConfig(displayFormat, minSwapInterval, maxSwapInterval, renderTargetFormat, depthStencilFormat, multiSample, true);
 	mSet.insert(conformantConfig);
 
-	Config nonConformantConfig(displayFormat, minSwapInterval, maxSwapInterval, renderTargetFormat, depthStencilFormat, multiSample, false);
-	mSet.insert(nonConformantConfig);
+	#ifdef __ANDROID__
+		Config nonConformantConfig(displayFormat, minSwapInterval, maxSwapInterval, renderTargetFormat, depthStencilFormat, multiSample, false);
+		mSet.insert(nonConformantConfig);
+	#endif
 }
 
 size_t ConfigSet::size() const