From a83a8b697be057ac56e79aa6b314b032ff2da8b0 Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 9 Oct 2023 15:07:26 -0700 Subject: Update prebuilt glslang binaries. (#3267) * Update prebuilt glslang binaries. * Update spirv-disassembling logic in slang-glslang. --------- Co-authored-by: Yong He --- source/slang-glslang/slang-glslang.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source') diff --git a/source/slang-glslang/slang-glslang.cpp b/source/slang-glslang/slang-glslang.cpp index fcaa9e70d..db9f7c0be 100644 --- a/source/slang-glslang/slang-glslang.cpp +++ b/source/slang-glslang/slang-glslang.cpp @@ -732,15 +732,15 @@ static int glslang_dissassembleSPIRV(const glslang_CompileRequest_1_2& request) typedef unsigned int SPIRVWord; SPIRVWord const* spirvBegin = (SPIRVWord const*)request.inputBegin; - SPIRVWord const* spirvEnd = (SPIRVWord const*)request.inputEnd; + SPIRVWord const* spirvEnd = (SPIRVWord const*)request.inputEnd; std::vector spirv(spirvBegin, spirvEnd); - std::stringstream spirvAsmStream; - spv::Disassemble(spirvAsmStream, spirv); - std::string result = spirvAsmStream.str(); - dump(result.c_str(), result.length(), request.outputFunc, request.outputUserData, stdout); + std::string result; + spvtools::SpirvTools spirvTools(SPV_ENV_UNIVERSAL_1_5); + spirvTools.Disassemble(spirv, &result, SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES | SPV_BINARY_TO_TEXT_OPTION_COMMENT); + dump(result.c_str(), result.length(), request.outputFunc, request.outputUserData, stdout); return 0; } -- cgit v1.2.3