Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Error Handling] Fix DxcContainerBuilder error handling #7056

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[Error Handling] Fix DxcContainerBuilder error handling #7056

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
819f345
fix error handling
bob80905 Jan 10, 2025
7dc1d0d
remove indirection check
bob80905 Jan 11, 2025
3c4b566
address feedback, no tests yet
bob80905 Jan 13, 2025
0370c17
add test no hash when validation failure
bob80905 Jan 16, 2025
4bc8379
address Tex
bob80905 Jan 17, 2025
efea0a0
chore: autopublish 2025-01-17T02:12:25Z
github-actions[bot] Jan 17, 2025
9194c53
address Tex
bob80905 Jan 18, 2025
2461915
clang format
bob80905 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions lib/DxilContainer/DxcContainerBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ HRESULT STDMETHODCALLTYPE DxcContainerBuilder::RemovePart(UINT32 fourCC) {
HRESULT STDMETHODCALLTYPE
DxcContainerBuilder::SerializeContainer(IDxcOperationResult **ppResult) {
DxcThreadMalloc TM(m_pMalloc);
if (ppResult == nullptr)
return E_INVALIDARG;

tex3d marked this conversation as resolved.
Show resolved Hide resolved
try {
// Allocate memory for new dxil container.
uint32_t ContainerSize = ComputeContainerSize();
Expand Down Expand Up @@ -161,6 +164,13 @@ DxcContainerBuilder::SerializeContainer(IDxcOperationResult **ppResult) {
errorHeap.Detach();
}

// Add Hash.
LPVOID PTR = pResult->GetBufferPointer();
if (!IsDxilContainerLike(PTR, pResult->GetBufferSize()))
return E_FAIL;

HashAndUpdate((DxilContainerHeader *)PTR);
tex3d marked this conversation as resolved.
Show resolved Hide resolved

IFT(DxcResult::Create(
valHR, DXC_OUT_OBJECT,
{DxcOutputObject::DataOutput(DXC_OUT_OBJECT, pResult, DxcOutNoName),
Expand All @@ -169,21 +179,6 @@ DxcContainerBuilder::SerializeContainer(IDxcOperationResult **ppResult) {
}
CATCH_CPP_RETURN_HRESULT();

if (ppResult == nullptr || *ppResult == nullptr)
return S_OK;

HRESULT HR;
(*ppResult)->GetStatus(&HR);
if (FAILED(HR))
return HR;

CComPtr<IDxcBlob> pObject;
IFR((*ppResult)->GetResult(&pObject));

// Add Hash.
LPVOID PTR = pObject->GetBufferPointer();
if (IsDxilContainerLike(PTR, pObject->GetBufferSize()))
HashAndUpdate((DxilContainerHeader *)PTR);
return S_OK;
}

Expand Down
2 changes: 1 addition & 1 deletion tools/clang/tools/dxclib/dxc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ int DxcContext::VerifyRootSignature() {
IFT(pContainerBuilder->AddPart(hlsl::DxilFourCC::DFCC_RootSignature,
pRootSignature));
CComPtr<IDxcOperationResult> pOperationResult;
pContainerBuilder->SerializeContainer(&pOperationResult);
IFT(pContainerBuilder->SerializeContainer(&pOperationResult));
HRESULT status = E_FAIL;
CComPtr<IDxcBlob> pResult;
IFT(pOperationResult->GetStatus(&status));
Expand Down
Loading