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

2016-05-05 12:04:22 -06:00
parent 6dea76add2 574ab04caa
commit c8a5676025
11 changed files with 506 additions and 6 deletions
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -138,6 +138,7 @@ INSTANTIATE_TEST_CASE_P(
        "spv.precision.frag",
        "spv.prepost.frag",
        "spv.qualifiers.vert",
+        "spv.shaderBallot.comp",
        "spv.shiftOps.frag",
        "spv.simpleFunctionCall.frag",
        "spv.simpleMat.vert",