https://github.com/shader-slang/slang
Tip revision: 911a4401b08f6199e18b32349c236c186a2dd128 authored by Yong He on 02 November 2023, 21:54:22 UTC
Fix crash when writing to `no_diff` out parameter. (#3308)
Fix crash when writing to `no_diff` out parameter. (#3308)
Tip revision: 911a440
slang-spirv-val.cpp
#include "slang-spirv-val.h"
namespace Slang
{
static SlangResult disassembleSPIRV(const List<uint8_t>& spirv, String& outErr, String& outDis)
{
// Set up our process
CommandLine commandLine;
commandLine.m_executableLocation.setName("spirv-dis");
commandLine.addArg("--comment");
commandLine.addArg("--color");
RefPtr<Process> p;
// If we failed to even start the process, then validation isn't available
SLANG_RETURN_ON_FAIL(Process::create(commandLine, 0, p));
const auto in = p->getStream(StdStreamType::In);
const auto out = p->getStream(StdStreamType::Out);
const auto err = p->getStream(StdStreamType::ErrorOut);
List<Byte> outData;
List<Byte> outErrData;
SLANG_RETURN_ON_FAIL(StreamUtil::readAndWrite(in, spirv.getArrayView(), out, outData, err, outErrData));
SLANG_RETURN_ON_FAIL(p->waitForTermination(10));
outDis = String(
reinterpret_cast<const char*>(outData.begin()),
reinterpret_cast<const char*>(outData.end())
);
outErr = String(
reinterpret_cast<const char*>(outErrData.begin()),
reinterpret_cast<const char*>(outErrData.end())
);
const auto ret = p->getReturnValue();
return ret == 0 ? SLANG_OK : SLANG_FAIL;
}
SlangResult debugValidateSPIRV(const List<uint8_t>& spirv)
{
// Set up our process
CommandLine commandLine;
commandLine.m_executableLocation.setName("spirv-val");
commandLine.addArg("--target-env");
commandLine.addArg("vulkan1.2");
commandLine.addArg("--scalar-block-layout");
RefPtr<Process> p;
const auto createResult = Process::create(commandLine, 0, p);
// If we failed to even start the process, then validation isn't available
if(SLANG_FAILED(createResult))
return SLANG_E_NOT_AVAILABLE;
const auto in = p->getStream(StdStreamType::In);
const auto out = p->getStream(StdStreamType::Out);
const auto err = p->getStream(StdStreamType::ErrorOut);
List<Byte> outData;
List<Byte> errData;
SLANG_RETURN_ON_FAIL(StreamUtil::readAndWrite(in, spirv.getArrayView(), out, outData, err, errData));
// Wait for it to finish
if(!p->waitForTermination(1000))
return SLANG_FAIL;
// If we failed, dump the spirv first.
const auto ret = p->getReturnValue();
if(ret != 0)
{
String spirvDisErr;
String spirvDis;
disassembleSPIRV(spirv, spirvDisErr, spirvDis);
fwrite(spirvDisErr.getBuffer(), spirvDisErr.getLength(), 1, stderr);
fwrite(spirvDis.getBuffer(), spirvDis.getLength(), 1, stderr);
}
fwrite(outData.getBuffer(), outData.getCount(), 1, stderr);
fwrite(errData.getBuffer(), errData.getCount(), 1, stderr);
return ret == 0 ? SLANG_OK : SLANG_FAIL;
}
}