mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dxbc] Omit empty source string in OpSource instruction 

This parameter is optional and confuses RenderDoc if present.
This commit is contained in:
Philip Rebohle 2018-05-02 13:07:26 +02:00
parent 5683422208
commit 27d3a78d79
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dxbc/dxbc_compiler.cpp
View File

@ -28,7 +28,7 @@ namespace dxvk {
m_module.setDebugSource(
spv::SourceLanguageUnknown, 0,
m_module.addDebugString(fileName.c_str()),
"");
nullptr);
// Set the memory model. This is the same for all shaders.
m_module.setMemoryModel(

10
src/spirv/spirv_module.cpp
View File

@ -133,12 +133,16 @@ namespace dxvk {
uint32_t version,
uint32_t file,
const char* source) {
m_debugNames.putIns (spv::OpSource,
4 + m_debugNames.strLen(source));
uint32_t strLen = source != nullptr
? m_debugNames.strLen(source) : 0;
m_debugNames.putIns (spv::OpSource, 4 + strLen);
m_debugNames.putWord(language);
m_debugNames.putWord(version);
m_debugNames.putWord(file);
m_debugNames.putStr (source);
if (source != nullptr)
m_debugNames.putStr(source);
}
void SpirvModule::setDebugName(