From c216644ecb12075b5cb97655ea2019f198a9da9e Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Tue, 3 Sep 2019 07:35:30 +0200 Subject: [PATCH] Update SPIR-V tools and headers Now with 1.5 support Affects: dEQP-VK.* Components: Vulkan, Framework VK-GL-CTS issue: 1926 Change-Id: Ib45e3d917dd613d1615f7f9d5c5056959d48bfac --- external/fetch_sources.py | 12 ++++++------ external/vulkancts/framework/vulkan/vkPrograms.cpp | 2 +- external/vulkancts/framework/vulkan/vkSpirVAsm.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/external/fetch_sources.py b/external/fetch_sources.py index 16cf6d7..915ee10 100644 --- a/external/fetch_sources.py +++ b/external/fetch_sources.py @@ -314,9 +314,9 @@ PACKAGES = [ "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e", "renderdoc"), GitRepo( - "https://github.com/KhronosGroup/SPIRV-Tools.git", - None, - "37e8f7994644151f425efa5b408d105713d2cd21", + "https://gitlab.khronos.org/spirv/spirv-tools.git", + "git@gitlab.khronos.org:spirv/spirv-tools.git", + "d2e9c95957992d2936ee65e49d4221ec449fb515", "spirv-tools"), GitRepo( "https://gitlab.khronos.org/GLSL/glslang.git", @@ -325,9 +325,9 @@ PACKAGES = [ "glslang", removeTags = ["master-tot"]), GitRepo( - "https://github.com/KhronosGroup/SPIRV-Headers.git", - None, - "123dc278f204f8e833e1a88d31c46d0edf81d4b2", + "https://gitlab.khronos.org/spirv/SPIRV-Headers.git", + "git@gitlab.khronos.org:spirv/SPIRV-Headers.git", + "e4a4372f5a8be1aae051353756eaf57def53655d", "spirv-headers"), GitRepo( "https://github.com/google/amber.git", diff --git a/external/vulkancts/framework/vulkan/vkPrograms.cpp b/external/vulkancts/framework/vulkan/vkPrograms.cpp index cb8bbe8..70f324f 100644 --- a/external/vulkancts/framework/vulkan/vkPrograms.cpp +++ b/external/vulkancts/framework/vulkan/vkPrograms.cpp @@ -114,7 +114,7 @@ void optimizeCompiledBinary (vector& binary, int optimizationRecipe, c case SPIRV_VERSION_1_2: case SPIRV_VERSION_1_3: targetEnv = SPV_ENV_VULKAN_1_1; break; case SPIRV_VERSION_1_4: targetEnv = SPV_ENV_VULKAN_1_1_SPIRV_1_4; break; - //case SPIRV_VERSION_1_5: targetEnv = SPV_ENV_VULKAN_1_2; break; + case SPIRV_VERSION_1_5: targetEnv = SPV_ENV_VULKAN_1_2; break; default: TCU_THROW(InternalError, "Unexpected SPIR-V version requested"); } diff --git a/external/vulkancts/framework/vulkan/vkSpirVAsm.cpp b/external/vulkancts/framework/vulkan/vkSpirVAsm.cpp index d63db43..9e622c2 100644 --- a/external/vulkancts/framework/vulkan/vkSpirVAsm.cpp +++ b/external/vulkancts/framework/vulkan/vkSpirVAsm.cpp @@ -68,7 +68,7 @@ static spv_target_env mapTargetSpvEnvironment(SpirvVersion spirvVersion) case SPIRV_VERSION_1_2: result = SPV_ENV_UNIVERSAL_1_2; break; //!< SPIR-V 1.2 case SPIRV_VERSION_1_3: result = SPV_ENV_UNIVERSAL_1_3; break; //!< SPIR-V 1.3 case SPIRV_VERSION_1_4: result = SPV_ENV_UNIVERSAL_1_4; break; //!< SPIR-V 1.4 - //case SPIRV_VERSION_1_5: result = SPV_ENV_UNIVERSAL_1_5; break; //!< SPIR-V 1.5 + case SPIRV_VERSION_1_5: result = SPV_ENV_UNIVERSAL_1_5; break; //!< SPIR-V 1.5 default: TCU_THROW(InternalError, "Unknown SPIR-V version"); } -- 2.7.4