From 3aba366a5817f8f775e25ab08f39fb0922cab154 Mon Sep 17 00:00:00 2001 From: Maciej Jesionowski Date: Wed, 12 Oct 2016 17:36:59 +0200 Subject: [PATCH] Update glslang (use SampledImage with OpImageQueryLod) Affected tests: - dEQP-VK.glsl.texture_functions.query.texturequerylod.* Fixes #514 Change-Id: Iea4c3f6007dc34a618e2171358a6ecc1cf57424d --- external/fetch_sources.py | 2 +- external/glslang/CMakeLists.txt | 34 +++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/external/fetch_sources.py b/external/fetch_sources.py index 6a68bf5..ce4bc89 100644 --- a/external/fetch_sources.py +++ b/external/fetch_sources.py @@ -174,7 +174,7 @@ PACKAGES = [ "spirv-tools"), GitRepo( "https://github.com/KhronosGroup/glslang.git", - "b8d2a006d1688a8590b5ae2a8df1aba1e6fbed0b", + "e3aa654c4b0c761b28d7864192ca8ceea6faf70a", "glslang"), ] diff --git a/external/glslang/CMakeLists.txt b/external/glslang/CMakeLists.txt index 96c4a5b..8fab581 100644 --- a/external/glslang/CMakeLists.txt +++ b/external/glslang/CMakeLists.txt @@ -36,50 +36,54 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp) 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/iomapper.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/ParseContextBase.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/propagateNoContraction.cpp - ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/reflection.cpp - ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/propagateNoContraction.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}/hlsl/hlslOpMap.cpp - ${GLSLANG_ABS_PATH}/hlsl/hlslParseables.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/Logger.cpp - ${GLSLANG_ABS_PATH}/SPIRV/doc.cpp - ${GLSLANG_ABS_PATH}/SPIRV/disassemble.cpp osinclude.cpp ) -- 2.7.4