Merge pull request #592 from ChrisGautier/barrier-wg

SPV: The execution scope for barriers should be Workgroup.

Merge pull request #592 from ChrisGautier/barrier-wg
20b030a7 · John Kessenich · GitHub · 84d11e18 · c3f1cdfa · 20b030a7
Commit 20b030a7 authored Nov 14, 2016 by John Kessenich Committed by GitHub Nov 14, 2016
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

GlslangToSpv.cpp SPIRV/GlslangToSpv.cpp +1 -1

spv.310.comp.out Test/baseResults/spv.310.comp.out +0 -0

spv.400.tesc.out Test/baseResults/spv.400.tesc.out +0 -0

No files found.
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -4597,7 +4597,7 @@ spv::Id TGlslangToSpvTraverser::createNoArgOperation(glslang::TOperator op, spv:
        builder.createNoResultOp(spv::OpEndPrimitive);
        return 0;
    case glslang::EOpBarrier:
-        builder.createControlBarrier(spv::ScopeDevice, spv::ScopeDevice, spv::MemorySemanticsMaskNone);
+        builder.createControlBarrier(spv::ScopeWorkgroup, spv::ScopeDevice, spv::MemorySemanticsMaskNone);
        return 0;
    case glslang::EOpMemoryBarrier:
        builder.createMemoryBarrier(spv::ScopeDevice, spv::MemorySemanticsAllMemory);

--- a/Test/baseResults/spv.310.comp.out
+++ b/Test/baseResults/spv.310.comp.out
--- a/Test/baseResults/spv.400.tesc.out
+++ b/Test/baseResults/spv.400.tesc.out