Update external sources.

Change-Id: I315f046e2405ecba4471d903314c73f6bd776e01

diff --git a/external/fetch_sources.py b/external/fetch_sources.py
index 89c16ed..9c27dd7 100644 (file)
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -170,11 +170,11 @@ PACKAGES = [
                postExtract = postExtractLibpng),
        GitRepo(
                "git@gitlab.khronos.org:spirv/spirv-tools.git",
-               "8a64b76360d2050908ce42e1c7b4d1d6297e82f5",
+               "31e482cdf5587b37a2bbae8b464ca260fd38e0d3",
                "spirv-tools"),
        GitRepo(
                "https://github.com/KhronosGroup/glslang",
-               "b9cd3996c7a67687b0a1fe5066c92e43a820de1e",
+               "142d7780a4d9e57e127bc8808a10c3093756da0f",
                "glslang"),
 ]
 

diff --git a/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp b/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp
index 31f8910..8b7d10d 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp
+++ b/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp
@@ -44,16 +44,12 @@
 
 #      include "SPIRV/GlslangToSpv.h"
 #      include "SPIRV/disassemble.h"
-#      include "SPIRV/GLSL450Lib.h"
 #      include "SPIRV/doc.h"
 #      include "glslang/Include/InfoSink.h"
 #      include "glslang/Include/ShHandle.h"
 #      include "glslang/MachineIndependent/localintermediate.h"
 #      include "glslang/Public/ShaderLang.h"
 
-// Required by SPIR-V disassembler
-const char* GlslStd450DebugNames[GLSL_STD_450::Count];
-
 #endif
 
 namespace vk
@@ -91,7 +87,6 @@ void initGlslang (void*)
 
        // SPIR-V disassembly
        spv::Parameterize();
-       GLSL_STD_450::GetDebugNames(GlslStd450DebugNames);
 }
 
 void prepareGlslang (void)