lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-13 13:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reporting of DXC errors in test app

Browse Source 
Fallback to compiling without -Qembed_debug if it fails, to support
older Windows 10 SDKs
This commit is contained in:
Steve Karolewics
2020-06-28 12:02:25 -07:00
committed by Baldur Karlsson
parent 310f1d05b8
commit 270700c290
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/d3d12/d3d12_test.cpp
+30 -16
View File
@@ -1006,7 +1006,8 @@ ID3DBlobPtr D3D12GraphicsTest::Compile(std::string src, std::string entry, std::
return NULL;
}
std::vector<const wchar_t *> args;
const size_t numAttempts = 2;
std::vector<const wchar_t *> args[numAttempts];
std::vector<std::wstring> argStorage;
argStorage.push_back(L"-WX");
@@ -1016,26 +1017,39 @@ ID3DBlobPtr D3D12GraphicsTest::Compile(std::string src, std::string entry, std::
argStorage.push_back(L"-Qembed_debug");
for(size_t i = 0; i < argStorage.size(); i++)
args.push_back(argStorage[i].c_str());
args[0].push_back(argStorage[i].c_str());
// The second set of args excludes -Qembed_debug, which can fail on older Windows 10 SDKs
for(size_t i = 0; i < argStorage.size() - 1; i++)
args[1].push_back(argStorage[i].c_str());
IDxcOperationResultPtr result;
hr = compiler->Compile(sourceBlob, UTF82Wide(entry).c_str(), UTF82Wide(entry).c_str(),
UTF82Wide(profile).c_str(), args.data(), (UINT)args.size(), NULL, 0,
NULL, &result);
if(SUCCEEDED(hr))
HRESULT hrStatus;
for(size_t i = 0; i < numAttempts; ++i)
{
result->GetStatus(&hr);
result = NULL;
hrStatus = E_NOINTERFACE;
if(SUCCEEDED(hr))
{
IDxcBlobPtr code = NULL;
result->GetResult(&code);
hr = compiler->Compile(sourceBlob, UTF82Wide(entry).c_str(), UTF82Wide(entry).c_str(),
UTF82Wide(profile).c_str(), args[i].data(), (UINT)args[i].size(), NULL,
0, NULL, &result);
dyn_CreateBlob((uint32_t)code->GetBufferSize(), &blob);
if(result)
result->GetStatus(&hrStatus);
memcpy(blob->GetBufferPointer(), code->GetBufferPointer(), code->GetBufferSize());
}
// Break early if compiling succeeds
if(SUCCEEDED(hr) && SUCCEEDED(hrStatus))
break;
}
if(SUCCEEDED(hr) && SUCCEEDED(hrStatus))
{
IDxcBlobPtr code = NULL;
result->GetResult(&code);
dyn_CreateBlob((uint32_t)code->GetBufferSize(), &blob);
memcpy(blob->GetBufferPointer(), code->GetBufferPointer(), code->GetBufferSize());
}
else
{
@@ -1045,7 +1059,7 @@ ID3DBlobPtr D3D12GraphicsTest::Compile(std::string src, std::string entry, std::
hr = result->GetErrorBuffer(&dxcErrors);
if(SUCCEEDED(hr) && dxcErrors)
{
TEST_ERROR("Failed to compile DXC shader: %s", hr, dxcErrors->GetBufferPointer());
TEST_ERROR("Failed to compile DXC shader: %s", dxcErrors->GetBufferPointer());
}
else
{