Merge branch 'feature2' of https://github.com/amdrexu/glslang into amdrexu-feature2

2016-05-05 16:32:39 -06:00
parent e2d06dbf60 338b185a2b
commit baa9fa5df7
10 changed files with 155 additions and 2 deletions
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -139,6 +139,7 @@ INSTANTIATE_TEST_CASE_P(
        "spv.prepost.frag",
        "spv.qualifiers.vert",
        "spv.shaderBallot.comp",
+        "spv.shaderGroupVote.comp",
        "spv.shiftOps.frag",
        "spv.simpleFunctionCall.frag",
        "spv.simpleMat.vert",