commit 0479437a5c5d1d727f72ff769f198b95a9650103
author John Kessenich <cepheus@frii.com> Wed Mar 01 13:49:11 2017 -0700
committer John Kessenich <cepheus@frii.com> Wed Mar 01 13:49:11 2017 -0700
tree 7efca60fd4f05f897228a1e26c14c46d756a671b
parent 173c0c01a647c4793ad5a588fc990362f3d2a23a

SPV: Fix #739: OpSelect can only operate on scalars and vectors.

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 925b859..5385eee 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1789,7 +1789,8 @@
     // Crucially, side effects must be avoided, and there are performance trade-offs.
     // Return true if good idea (and safe) for OpSelect, false otherwise.
     const auto selectPolicy = [&]() -> bool {
-        if (node->getBasicType() == glslang::EbtVoid)
+        if ((!node->getType().isScalar() && !node->getType().isVector()) ||
+            node->getBasicType() == glslang::EbtVoid)
             return false;
 
         if (node->getTrueBlock()  == nullptr ||