Move SPIRV into glslang

BUILD.gn

@@ -117,34 +117,34 @@ template("glslang_sources_common") {
     }
 
     sources = [
-      "SPIRV/GLSL.ext.AMD.h",
-      "SPIRV/GLSL.ext.EXT.h",
-      "SPIRV/GLSL.ext.KHR.h",
-      "SPIRV/GLSL.ext.NV.h",
-      "SPIRV/GLSL.ext.ARM.h",
-      "SPIRV/GLSL.ext.QCOM.h",
-      "SPIRV/GLSL.std.450.h",
-      "SPIRV/GlslangToSpv.cpp",
-      "SPIRV/GlslangToSpv.h",
-      "SPIRV/InReadableOrder.cpp",
-      "SPIRV/Logger.cpp",
-      "SPIRV/Logger.h",
-      "SPIRV/NonSemanticDebugPrintf.h",
-      "SPIRV/NonSemanticShaderDebugInfo100.h",
-      "SPIRV/SPVRemapper.cpp",
-      "SPIRV/SPVRemapper.h",
-      "SPIRV/SpvBuilder.cpp",
-      "SPIRV/SpvBuilder.h",
-      "SPIRV/SpvPostProcess.cpp",
-      "SPIRV/SpvTools.h",
-      "SPIRV/bitutils.h",
-      "SPIRV/disassemble.cpp",
-      "SPIRV/disassemble.h",
-      "SPIRV/doc.cpp",
-      "SPIRV/doc.h",
-      "SPIRV/hex_float.h",
-      "SPIRV/spirv.hpp",
-      "SPIRV/spvIR.h",
+      "glslang/SPIRV/GLSL.ext.AMD.h",
+      "glslang/SPIRV/GLSL.ext.EXT.h",
+      "glslang/SPIRV/GLSL.ext.KHR.h",
+      "glslang/SPIRV/GLSL.ext.NV.h",
+      "glslang/SPIRV/GLSL.ext.ARM.h",
+      "glslang/SPIRV/GLSL.ext.QCOM.h",
+      "glslang/SPIRV/GLSL.std.450.h",
+      "glslang/SPIRV/GlslangToSpv.cpp",
+      "glslang/SPIRV/GlslangToSpv.h",
+      "glslang/SPIRV/InReadableOrder.cpp",
+      "glslang/SPIRV/Logger.cpp",
+      "glslang/SPIRV/Logger.h",
+      "glslang/SPIRV/NonSemanticDebugPrintf.h",
+      "glslang/SPIRV/NonSemanticShaderDebugInfo100.h",
+      "glslang/SPIRV/SPVRemapper.cpp",
+      "glslang/SPIRV/SPVRemapper.h",
+      "glslang/SPIRV/SpvBuilder.cpp",
+      "glslang/SPIRV/SpvBuilder.h",
+      "glslang/SPIRV/SpvPostProcess.cpp",
+      "glslang/SPIRV/SpvTools.h",
+      "glslang/SPIRV/bitutils.h",
+      "glslang/SPIRV/disassemble.cpp",
+      "glslang/SPIRV/disassemble.h",
+      "glslang/SPIRV/doc.cpp",
+      "glslang/SPIRV/doc.h",
+      "glslang/SPIRV/hex_float.h",
+      "glslang/SPIRV/spirv.hpp",
+      "glslang/SPIRV/spvIR.h",
       "glslang/GenericCodeGen/CodeGen.cpp",
       "glslang/GenericCodeGen/Link.cpp",
       "glslang/Include/BaseTypes.h",
@@ -237,7 +237,7 @@ template("glslang_sources_common") {
 
     defines = [ "ENABLE_SPIRV=1" ]
     if (invoker.enable_opt) {
-      sources += [ "SPIRV/SpvTools.cpp" ]
+      sources += [ "glslang/SPIRV/SpvTools.cpp" ]
       defines += [ "ENABLE_OPT=1" ]
     }
 

CMakeLists.txt

@@ -315,7 +315,7 @@ else()
 endif()
 
 if(ENABLE_SPIRV)
-    add_subdirectory(SPIRV)
+    add_subdirectory(glslang/SPIRV)
 endif()
 add_subdirectory(glslang)
 if(ENABLE_GLSLANG_BINARIES)

StandAlone/StandAlone.cpp

@@ -44,11 +44,11 @@
 #include "glslang/Public/ResourceLimits.h"
 #include "Worklist.h"
 #include "DirStackFileIncluder.h"
-#include "./../glslang/Public/ShaderLang.h"
-#include "../glslang/MachineIndependent/localintermediate.h"
-#include "../SPIRV/GlslangToSpv.h"
-#include "../SPIRV/GLSL.std.450.h"
-#include "../SPIRV/disassemble.h"
+#include "glslang/Public/ShaderLang.h"
+#include "glslang/MachineIndependent/localintermediate.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/GLSL.std.450.h"
+#include "glslang/SPIRV/disassemble.h"
 
 #include <array>
 #include <atomic>

StandAlone/spirv-remap.cpp

@@ -42,7 +42,7 @@
 //
 // Include remapper
 //
-#include "../SPIRV/SPVRemapper.h"
+#include "glslang/SPIRV/SPVRemapper.h"
 
 namespace {
 

glslang/CMakeLists.txt

@@ -242,8 +242,8 @@ if(WIN32)
     source_group("MachineIndependent\\Preprocessor" REGULAR_EXPRESSION "MachineIndependent/preprocessor/*")
     source_group("HLSL" REGULAR_EXPRESSION "HLSL/*")
     source_group("CInterface" REGULAR_EXPRESSION "CInterface/*")
-    source_group("SPIRV" REGULAR_EXPRESSION "SPIRV/[^/]*")
-    source_group("SPIRV\\CInterface" REGULAR_EXPRESSION "SPIRV/CInterface/*")
+    source_group("SPIRV" REGULAR_EXPRESSION "glslang/SPIRV/[^/]*")
+    source_group("SPIRV\\CInterface" REGULAR_EXPRESSION "glslang/SPIRV/CInterface/*")
 endif()
 
 ################################################################################

glslang/OSDependent/Web/glslang.js.cpp

@@ -41,8 +41,8 @@
 #include <emscripten.h>
 #endif
 
-#include "../../../SPIRV/GlslangToSpv.h"
-#include "../../../glslang/Public/ShaderLang.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/Public/ShaderLang.h"
 
 #ifndef __EMSCRIPTEN__
 #define EMSCRIPTEN_KEEPALIVE

SPIRV/CInterface/spirv_c_interface.cpp → glslang/SPIRV/CInterface/spirv_c_interface.cpp

@@ -34,9 +34,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstring>
 #include "glslang/Public/ShaderLang.h"
-#include "SPIRV/GlslangToSpv.h"
-#include "SPIRV/Logger.h"
-#include "SPIRV/SpvTools.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/Logger.h"
+#include "glslang/SPIRV/SpvTools.h"
 
 static_assert(sizeof(glslang_spv_options_t) == sizeof(glslang::SpvOptions), "");
 

SPIRV/CMakeLists.txt → glslang/SPIRV/CMakeLists.txt

@@ -81,7 +81,7 @@ set(PUBLIC_HEADERS
     SPVRemapper.h
     SpvTools.h)
 
-add_library(SPIRV ${LIB_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/../glslang/stub.cpp)
+add_library(SPIRV ${LIB_TYPE} ${CMAKE_CURRENT_SOURCE_DIR}/../stub.cpp)
 add_library(glslang::SPIRV ALIAS SPIRV)
 set_target_properties(SPIRV PROPERTIES
     FOLDER glslang

SPIRV/GlslangToSpv.cpp → glslang/SPIRV/GlslangToSpv.cpp

@@ -56,9 +56,9 @@ namespace spv {
 }
 
 // Glslang includes
-#include "../glslang/MachineIndependent/localintermediate.h"
-#include "../glslang/MachineIndependent/SymbolTable.h"
-#include "../glslang/Include/Common.h"
+#include "glslang/MachineIndependent/localintermediate.h"
+#include "glslang/MachineIndependent/SymbolTable.h"
+#include "glslang/Include/Common.h"
 
 // Build-time generated includes
 #include "glslang/build_info.h"

gtests/HexFloat.cpp

@@ -20,7 +20,7 @@
 #include <tuple>
 
 #include <gmock/gmock.h>
-#include "SPIRV/hex_float.h"
+#include "glslang/SPIRV/hex_float.h"
 
 namespace {
 using ::testing::Eq;

gtests/TestFixture.h

@@ -45,10 +45,10 @@
 
 #include <gtest/gtest.h>
 
-#include "SPIRV/GlslangToSpv.h"
-#include "SPIRV/disassemble.h"
-#include "SPIRV/doc.h"
-#include "SPIRV/SPVRemapper.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/disassemble.h"
+#include "glslang/SPIRV/doc.h"
+#include "glslang/SPIRV/SPVRemapper.h"
 #include "glslang/Include/Types.h"
 #include "glslang/Public/ResourceLimits.h"
 #include "glslang/Public/ShaderLang.h"
@@ -378,7 +378,7 @@ class GlslangTest : public GT {
 
         glslang::TProgram program;
         program.addShader(&shader);
-        
+
         success &= program.link(controls);
         if (success)
             program.mapIO();

license-checker.cfg

@@ -34,10 +34,10 @@
                     "Test/**",
                     "External/spirv-tools/**",
 
-                    "SPIRV/GLSL.*.h",
-                    "SPIRV/NonSemanticDebugPrintf.h",
-                    "SPIRV/NonSemanticShaderDebugInfo100.h",
-                    "SPIRV/spirv.hpp"
+                    "glslang/SPIRV/GLSL.*.h",
+                    "glslang/SPIRV/NonSemanticDebugPrintf.h",
+                    "glslang/SPIRV/NonSemanticShaderDebugInfo100.h",
+                    "glslang/SPIRV/spirv.hpp"
                 ]
             }
         ]

ndk_test/test.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "SPIRV/GlslangToSpv.h"
+#include "glslang/SPIRV/GlslangToSpv.h"
 
 void android_main(struct android_app* state) {
   int version = glslang::GetSpirvGeneratorVersion();