Update glslang to d02dc5d
authorPyry Haulos <phaulos@google.com>
Tue, 29 Nov 2016 23:24:17 +0000 (15:24 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 29 Nov 2016 23:24:17 +0000 (15:24 -0800)
Bug: 33041922

(cherry picked from commit 4e1f56d2457e0c8736e3e92c48bd8df0c309d600)

Change-Id: I7c2ffd66f55cafa402ffc7a0222973e282f4825f

external/fetch_sources.py
external/glslang/CMakeLists.txt

index 67024d5..5178350 100644 (file)
@@ -174,7 +174,7 @@ PACKAGES = [
                "spirv-tools"),
        GitRepo(
                "https://github.com/KhronosGroup/glslang.git",
-               "5639f3aca5b75cbe5419a623eecf5e3794fab917",
+               "d02dc5d05ad1f63db8d37fda9928a4d59e3c132d",
                "glslang"),
 ]
 
index 7c040e3..3a7b96c 100644 (file)
@@ -29,46 +29,59 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp)
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent
                ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen
                ${GLSLANG_ABS_PATH}/glslang/OSDependent
+               ${GLSLANG_ABS_PATH}/hlsl
                ${GLSLANG_ABS_PATH}/OGLCompilersDLL
                ${GLSLANG_ABS_PATH}/SPIRV
                )
 
        set(GLSLANG_SRCS
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/Constant.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/glslang_tab.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/InfoSink.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/Initialize.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/IntermTraverse.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/Intermediate.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/intermOut.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/IntermTraverse.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/limits.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/linkValidate.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/parseConst.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/ParseHelper.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/PoolAlloc.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/propagateNoContraction.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/reflection.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/RemoveTree.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/Scan.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/ShaderLang.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/SymbolTable.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/Versions.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/glslang_tab.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/intermOut.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/limits.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/linkValidate.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/parseConst.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/reflection.cpp
-               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/Pp.cpp
+
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpAtom.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpContext.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/Pp.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpMemory.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpScanner.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpSymbols.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+
                ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp
                ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/Link.cpp
+
                ${GLSLANG_ABS_PATH}/OGLCompilersDLL/InitializeDll.cpp
 
+               ${GLSLANG_ABS_PATH}/hlsl/hlslGrammar.cpp
+               ${GLSLANG_ABS_PATH}/hlsl/hlslOpMap.cpp
+               ${GLSLANG_ABS_PATH}/hlsl/hlslParseables.cpp
+               ${GLSLANG_ABS_PATH}/hlsl/hlslParseHelper.cpp
+               ${GLSLANG_ABS_PATH}/hlsl/hlslScanContext.cpp
+               ${GLSLANG_ABS_PATH}/hlsl/hlslTokenStream.cpp
+
+               ${GLSLANG_ABS_PATH}/SPIRV/disassemble.cpp
+               ${GLSLANG_ABS_PATH}/SPIRV/doc.cpp
                ${GLSLANG_ABS_PATH}/SPIRV/GlslangToSpv.cpp
                ${GLSLANG_ABS_PATH}/SPIRV/InReadableOrder.cpp
+               ${GLSLANG_ABS_PATH}/SPIRV/Logger.cpp
                ${GLSLANG_ABS_PATH}/SPIRV/SpvBuilder.cpp
                ${GLSLANG_ABS_PATH}/SPIRV/SPVRemapper.cpp
-               ${GLSLANG_ABS_PATH}/SPIRV/doc.cpp
-               ${GLSLANG_ABS_PATH}/SPIRV/disassemble.cpp
 
                osinclude.cpp
                )