diff options
| author | Ari Suonpää <ari.suonpaa@siru.fi> | 2017-06-21 09:08:02 +0300 |
|---|---|---|
| committer | Ari Suonpää <ari.suonpaa@siru.fi> | 2017-09-07 10:20:32 +0300 |
| commit | 75bc5afcbeddef9465b8c5c54fcd76c4f6f165a5 (patch) | |
| tree | 3644f22e62eda2cbdf7547bd5d58404da7849e89 /external/glslang | |
| parent | 36ab08a77d2614ec5dfe0ca4f1808ab981fe6d4a (diff) | |
| download | VK-GL-CTS-75bc5afcbeddef9465b8c5c54fcd76c4f6f165a5.tar.gz VK-GL-CTS-75bc5afcbeddef9465b8c5c54fcd76c4f6f165a5.tar.bz2 VK-GL-CTS-75bc5afcbeddef9465b8c5c54fcd76c4f6f165a5.zip | |
Add HLSL compilation support and some tessellation tests.
Compilation of HLSL shaders is now supported by adding source code to hlslSources member of program collection.
HLSL shaders were added to tessellation.winding and tessellation.fractional_spacing tests to cover requirements
of VK-GL-CTS issue 334.
Affects:
dEQP-VK.glsl.*
dEQP-VK.tessellation.*
dEQP-VK.api.smoke.create_shader
Components: Vulkan
VK-GL-CTS issue: 334
Change-Id: I40ed8228cd17d922f64679272696451916f8bbc2
Diffstat (limited to 'external/glslang')
| -rw-r--r-- | external/glslang/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/glslang/CMakeLists.txt b/external/glslang/CMakeLists.txt index 8fab581f2..f97fe4eb0 100644 --- a/external/glslang/CMakeLists.txt +++ b/external/glslang/CMakeLists.txt @@ -60,9 +60,7 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.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 @@ -70,6 +68,7 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp) ${GLSLANG_ABS_PATH}/OGLCompilersDLL/InitializeDll.cpp + ${GLSLANG_ABS_PATH}/hlsl/hlslAttributes.cpp ${GLSLANG_ABS_PATH}/hlsl/hlslGrammar.cpp ${GLSLANG_ABS_PATH}/hlsl/hlslOpMap.cpp ${GLSLANG_ABS_PATH}/hlsl/hlslParseables.cpp @@ -98,6 +97,8 @@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp) add_library(glslang STATIC ${GLSLANG_SRCS}) target_link_libraries(glslang dethread ${ZLIB_LIBRARY}) + add_definitions(-DENABLE_HLSL) + set(GLSLANG_INCLUDE_PATH ${GLSLANG_ABS_PATH} PARENT_SCOPE) set(GLSLANG_LIBRARY glslang PARENT_SCOPE) set(DEQP_HAVE_GLSLANG ON PARENT_SCOPE) |