From 4931ac2af8185454a6ad15ed2f7451f061e615f6 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Tue, 4 Dec 2018 16:22:53 +0100 Subject: [PATCH] Update glslang Components: Framework, Vulkan Change-Id: Ic2ecbd6915b8f4d6ecfc6a291df0791ddf5167e8 --- external/fetch_sources.py | 2 +- .../modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/fetch_sources.py b/external/fetch_sources.py index 3ed9947..98fdbce 100755 --- a/external/fetch_sources.py +++ b/external/fetch_sources.py @@ -263,7 +263,7 @@ PACKAGES = [ GitRepo( "https://github.com/KhronosGroup/glslang.git", None, - "4efc6f1ed0d61c0cacf398b8216e572d5a5c770d", + "0bb930fc0fbe5258261e807ee875bb77258c1a86", "glslang", removeTags = ["master-tot"]), GitRepo( diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp index 9366664..05b33ec 100644 --- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp @@ -6171,8 +6171,8 @@ void PrecisionCase::testStatement (const Variables& variables, const St for (vector::const_iterator symIter = m_spec.inputs.begin(); symIter != m_spec.inputs.end(); ++symIter) inputs16Bit = inputs16Bit || glu::isDataTypeFloat16OrVec(symIter->varType.getBasicType()); - if (inputs16Bit || m_spec.packFloat16Bit) //TODO GL_KHR_shader_explicit_arithmetic_types spirv/glsl tools need to be updated [24.05.2018 A.Sarwa] - m_spec.globalDeclarations += "#extension GL_KHX_shader_explicit_arithmetic_types: require\n"; + if (inputs16Bit || m_spec.packFloat16Bit) + m_spec.globalDeclarations += "#extension GL_EXT_shader_explicit_arithmetic_types: require\n"; m_spec.outputs.resize(outCount); -- 2.7.4