postExtract = postExtractLibpng),
GitRepo(
"https://github.com/KhronosGroup/SPIRV-Tools.git",
- "f7e63786a919040cb2e0e572d960a0650f2c2881",
+ "7649c7362d9b7622399fa0ead24de836b0c7540e",
"spirv-tools"),
GitRepo(
"https://github.com/KhronosGroup/glslang.git",
- "5639f3aca5b75cbe5419a623eecf5e3794fab917",
+ "7e3e48634429785092ef872068a95ef7834e50c8",
"glslang"),
]
${GLSLANG_ABS_PATH}/glslang/OSDependent
${GLSLANG_ABS_PATH}/OGLCompilersDLL
${GLSLANG_ABS_PATH}/SPIRV
+ ${GLSLANG_ABS_PATH}/hlsl
)
set(GLSLANG_SRCS
${GLSLANG_ABS_PATH}/SPIRV/doc.cpp
${GLSLANG_ABS_PATH}/SPIRV/disassemble.cpp
+ ${GLSLANG_ABS_PATH}/hlsl/hlslGrammar.cpp
+ ${GLSLANG_ABS_PATH}/hlsl/hlslParseHelper.cpp
+ ${GLSLANG_ABS_PATH}/hlsl/hlslScanContext.cpp
+
osinclude.cpp
)
#if defined(DEQP_HAVE_SPIRV_TOOLS)
+static const spv_target_env s_defaultEnvironment = SPV_ENV_VULKAN_1_0;
+
bool assembleSpirV (const SpirVAsmSource* program, std::vector<deUint32>* dst, SpirVProgramInfo* buildInfo)
{
- const spv_context context = spvContextCreate();
+ const spv_context context = spvContextCreate(s_defaultEnvironment);
spv_binary binary = DE_NULL;
spv_diagnostic diagnostic = DE_NULL;
void disassembleSpirV (size_t binarySizeInWords, const deUint32* binary, std::ostream* dst)
{
- const spv_context context = spvContextCreate();
+ const spv_context context = spvContextCreate(s_defaultEnvironment);
spv_text text = DE_NULL;
spv_diagnostic diagnostic = DE_NULL;
bool validateSpirV (size_t binarySizeInWords, const deUint32* binary, std::ostream* infoLog)
{
- const spv_context context = spvContextCreate();
+ const spv_context context = spvContextCreate(s_defaultEnvironment);
spv_diagnostic diagnostic = DE_NULL;
try