Merge pull request #404 from phaulos/fix-spirv-remap

Remapper: Remap Scope and MemorySemantics IDs in SPIRV remapper

Merge pull request #404 from phaulos/fix-spirv-remap
b8d2a006 · John Kessenich · GitHub · 630e1bc6 · b93e3a39 · b8d2a006
Commit b8d2a006 authored Jul 22, 2016 by John Kessenich Committed by GitHub Jul 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

SPVRemapper.cpp SPIRV/SPVRemapper.cpp +2 -2

No files found.
--- a/SPIRV/SPVRemapper.cpp
+++ b/SPIRV/SPVRemapper.cpp
@@ -440,6 +440,8 @@ namespace spv {
        for (int op = 0; numOperands > 0; ++op, --numOperands) {
            switch (spv::InstructionDesc[opCode].operands.getClass(op)) {
            case spv::OperandId:
+            case spv::OperandScope:
+            case spv::OperandMemorySemantics:
                idFn(asId(word++));
                break;
@@ -500,9 +502,7 @@ namespace spv {
            case spv::OperandSelect:
            case spv::OperandLoop:
            case spv::OperandFunction:
-            case spv::OperandMemorySemantics:
            case spv::OperandMemoryAccess:
-            case spv::OperandScope:
            case spv::OperandGroupOperation:
            case spv::OperandKernelEnqueueFlags:
            case spv::OperandKernelProfilingInfo: