Update glslang, SPIR-V commits

Components: Framework

Affects: dEQP-VK.*

Change-Id: If5830108278597a28f8043dd947bed3c20c9688d

diff --git a/external/fetch_sources.py b/external/fetch_sources.py
index 4102ee5..71f852a 100644 (file)
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -250,18 +250,18 @@ PACKAGES = [
                "libpng",
                postExtract = postExtractLibpng),
        GitRepo(
-               "https://gitlab.khronos.org/spirv/spirv-tools.git",
-               "git@gitlab.khronos.org:spirv/spirv-tools.git",
+               "https://github.com/KhronosGroup/SPIRV-Tools.git",
+               None,
                "vulkan-1.1-rc1",
                "spirv-tools"),
        GitRepo(
-               "https://gitlab.khronos.org/GLSL/glslang.git",
-               "git@gitlab.khronos.org:GLSL/glslang.git",
-               "vulkan-1.1-rc8",
+               "https://github.com/KhronosGroup/glslang.git",
+               None,
+               "6.2.2596",
                "glslang"),
        GitRepo(
-               "https://gitlab.khronos.org/spirv/SPIRV-Headers.git",
-               "git@gitlab.khronos.org:spirv/SPIRV-Headers.git",
+               "https://github.com/KhronosGroup/SPIRV-Headers.git",
+               None,
                "vulkan-1.1-rc2",
                "spirv-headers"),
 ]

diff --git a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
index e1ebdd1..9b51579 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
+++ b/external/vulkancts/framework/vulkan/vkShaderToSpirV.cpp
@@ -272,16 +272,16 @@ bool compileShaderToSpirV (const std::vector<std::string>* sources, const Shader
                        switch ( buildOptions.targetVersion )
                        {
                        case SPIRV_VERSION_1_0:
-                               shader.setEnvTarget(glslang::EshTargetSpv, 0x10000);
+                               shader.setEnvTarget(glslang::EshTargetSpv, (glslang::EShTargetLanguageVersion)0x10000);
                                break;
                        case SPIRV_VERSION_1_1:
-                               shader.setEnvTarget(glslang::EshTargetSpv, 0x10100);
+                               shader.setEnvTarget(glslang::EshTargetSpv, (glslang::EShTargetLanguageVersion)0x10100);
                                break;
                        case SPIRV_VERSION_1_2:
-                               shader.setEnvTarget(glslang::EshTargetSpv, 0x10200);
+                               shader.setEnvTarget(glslang::EshTargetSpv, (glslang::EShTargetLanguageVersion)0x10200);
                                break;
                        case SPIRV_VERSION_1_3:
-                               shader.setEnvTarget(glslang::EshTargetSpv, 0x10300);
+                               shader.setEnvTarget(glslang::EshTargetSpv, (glslang::EShTargetLanguageVersion)0x10300);
                                break;
                        }