Skip to content

Handle nullptr checks for API calls consistently. #725

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

Merged
merged 1 commit into from
Jan 19, 2023
Merged

Handle nullptr checks for API calls consistently. #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/gpgmm/d3d12/ErrorD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@

namespace gpgmm::d3d12 {

#define ReturnIfNullptr(expr) \
{ \
if (GPGMM_UNLIKELY(expr == nullptr)) { \
return E_POINTER; \
} \
} \
for (;;) \
break

#define ReturnIfFailed(expr) \
{ \
HRESULT hr = expr; \
Expand Down
17 changes: 8 additions & 9 deletions src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@ namespace gpgmm::d3d12 {
// static
HRESULT ResidencyManager::CreateResidencyManager(const RESIDENCY_DESC& descriptor,
IResidencyManager** ppResidencyManagerOut) {
if (descriptor.Adapter == nullptr || descriptor.Device == nullptr) {
return E_INVALIDARG;
}
ReturnIfNullptr(descriptor.Adapter);
ReturnIfNullptr(descriptor.Device);

std::unique_ptr<Caps> caps;
{
Expand Down Expand Up @@ -311,12 +310,12 @@ namespace gpgmm::d3d12 {

// Increments number of locks on a heap to ensure the heap remains resident.
HRESULT ResidencyManager::LockHeap(IHeap* pHeap) {
ReturnIfNullptr(pHeap);

std::lock_guard<std::mutex> lock(mMutex);

Heap* heap = static_cast<Heap*>(pHeap);
if (heap == nullptr) {
return E_INVALIDARG;
}
ASSERT(heap != nullptr);

if (!heap->IsInList() && !heap->IsResidencyLocked()) {
ComPtr<ID3D12Pageable> pageable;
Expand Down Expand Up @@ -351,11 +350,11 @@ namespace gpgmm::d3d12 {
// Decrements number of locks on a heap. When the number of locks becomes zero, the heap is
// inserted into the LRU cache and becomes eligible for eviction.
HRESULT ResidencyManager::UnlockHeap(IHeap* pHeap) {
ReturnIfNullptr(pHeap);

std::lock_guard<std::mutex> lock(mMutex);
Heap* heap = static_cast<Heap*>(pHeap);
if (heap == nullptr) {
return E_INVALIDARG;
}
ASSERT(heap != nullptr);

if (!heap->IsResidencyLocked()) {
return E_FAIL;
Expand Down
14 changes: 4 additions & 10 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,7 @@ namespace gpgmm::d3d12 {
HRESULT ResourceAllocator::CreateResourceAllocator(const ALLOCATOR_DESC& allocatorDescriptor,
IResourceAllocator** ppResourceAllocatorOut,
IResidencyManager** ppResidencyManagerOut) {
if (allocatorDescriptor.Device == nullptr) {
return E_INVALIDARG;
}
ReturnIfNullptr(allocatorDescriptor.Device);

ComPtr<IResidencyManager> residencyManager;
if (ppResidencyManagerOut != nullptr) {
Expand Down Expand Up @@ -430,9 +428,7 @@ namespace gpgmm::d3d12 {
const ALLOCATOR_DESC& allocatorDescriptor,
IResidencyManager* pResidencyManager,
IResourceAllocator** ppResourceAllocatorOut) {
if (allocatorDescriptor.Device == nullptr) {
return E_INVALIDARG;
}
ReturnIfNullptr(allocatorDescriptor.Device);

std::unique_ptr<Caps> caps;
{
Expand Down Expand Up @@ -1234,11 +1230,9 @@ namespace gpgmm::d3d12 {
HRESULT ResourceAllocator::CreateResource(const ALLOCATION_DESC& allocationDescriptor,
ID3D12Resource* pCommittedResource,
IResourceAllocation** ppResourceAllocationOut) {
std::lock_guard<std::mutex> lock(mMutex);
ReturnIfNullptr(pCommittedResource);

if (pCommittedResource == nullptr) {
return E_INVALIDARG;
}
std::lock_guard<std::mutex> lock(mMutex);

ComPtr<ID3D12Resource> resource(pCommittedResource);

Expand Down