commit d445bb2867a56b5e053c7b5fb5a7b007294e2043
author Greg Fischer <greg@lunarg.com> Thu Dec 06 11:13:15 2018 -0700
committer Greg Fischer <greg@lunarg.com> Fri Dec 28 12:06:43 2018 -0700
tree 3e0ae08ddcf0a84b9e98ba18b66f43e50c3ac45a
parent 9ed38739b974f9d6585e8c5f11184409b11d3817

Create separate OpSource for each included file

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 0cc0590..6dc25ab 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1297,6 +1297,10 @@
             text.append("#line 1\n");
         text.append(glslangIntermediate->getSourceText());
         builder.setSourceText(text);
+        // Pass name and text for all included files
+        const std::map<std::string, std::string>& include_txt = glslangIntermediate->getIncludeText();
+        for (auto iItr = include_txt.begin(); iItr != include_txt.end(); ++iItr)
+            builder.addInclude(iItr->first, iItr->second);
     }
     stdBuiltins = builder.import("GLSL.std.450");
     if (glslangIntermediate->usingVulkanMemoryModel()) {