Merge pull request #1632 from alan-baker/mem-model-1610

Move memory model scope tests to Vulkan 1.1 batch

Merge pull request #1632 from alan-baker/mem-model-1610
1a19598e · John Kessenich · GitHub · 6d178658 · 3b656c79 · 1a19598e
Unverified Commit 1a19598e authored Dec 17, 2018 by John Kessenich Committed by GitHub Dec 17, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 68 additions and 68 deletions

spv.memoryScopeSemantics.comp.out Test/baseResults/spv.memoryScopeSemantics.comp.out +66 -66

Spv.FromFile.cpp gtests/Spv.FromFile.cpp +2 -2

No files found.
--- a/Test/baseResults/spv.memoryScopeSemantics.comp.out
+++ b/Test/baseResults/spv.memoryScopeSemantics.comp.out
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -304,8 +304,6 @@ INSTANTIATE_TEST_CASE_P(
        "spv.matrix.frag",
        "spv.matrix2.frag",
        "spv.memoryQualifier.frag",
-        "spv.memoryScopeSemantics.comp",
-        "spv.memoryScopeSemantics_Error.comp",
        "spv.merge-unreachable.frag",
        "spv.multiStruct.comp",
        "spv.multiStructFuncall.frag",
@@ -404,6 +402,8 @@ INSTANTIATE_TEST_CASE_P(
        "spv.explicittypes.frag",
        "spv.float32.frag",
        "spv.float64.frag",
+        "spv.memoryScopeSemantics.comp",
+        "spv.memoryScopeSemantics_Error.comp",
        "spv.multiView.frag",
        "spv.RayGenShader11.rgen",
        "spv.subgroup.frag",