Merge pull request #326 from greg-lunarg/greg-mr4

remapper: do not eliminate interface variables in dce

Merge pull request #326 from greg-lunarg/greg-mr4
9f1f8180 · John Kessenich · 438bb609 · 39d5e711 · 9f1f8180
Commit 9f1f8180 authored Jun 03, 2016 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

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

No files found.
--- a/SPIRV/SPVRemapper.cpp
+++ b/SPIRV/SPVRemapper.cpp
@@ -926,8 +926,17 @@ namespace spv {
        // Count function variable use
        process(
            [&](spv::Op opCode, unsigned start) {
-                if (opCode == spv::OpVariable) { ++varUseCount[asId(start+2)]; return true; }
-                return false;
+                if (opCode == spv::OpVariable) {
+                    ++varUseCount[asId(start+2)];
+                    return true;
+                } else if (opCode == spv::OpEntryPoint) {
+                    const int wordCount = asWordCount(start);
+                    for (int i = 4; i < wordCount; i++) {
+                        ++varUseCount[asId(start+i)];
+                    }
+                    return true;
+                } else
+                    return false;
            },

            [&](spv::Id& id) { if (varUseCount[id]) ++varUseCount[id]; }