Skip to content

Fix error returned by resource tier mismatch. #811

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
Apr 3, 2023
Merged

Fix error returned by resource tier mismatch. #811

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
7 changes: 4 additions & 3 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ namespace gpgmm::d3d12 {
<< allocatorDescriptor.ResourceHeapTier << " vs "
<< caps->GetMaxResourceHeapTierSupported()
<< "). Please consider using a lower resource heap tier.";
return E_FAIL;
return E_INVALIDARG;
}

if (allocatorDescriptor.ResourceHeapTier != 0 &&
Expand Down Expand Up @@ -547,7 +547,7 @@ namespace gpgmm::d3d12 {
}

// Resource heap tier is required but user didn't specify one.
if (newDescriptor.ResourceHeapTier == 0) {
if (allocatorDescriptor.ResourceHeapTier == 0) {
newDescriptor.ResourceHeapTier = caps->GetMaxResourceHeapTierSupported();
}

Expand All @@ -559,7 +559,8 @@ namespace gpgmm::d3d12 {
newDescriptor.PreferredResourceHeapSize =
(allocatorDescriptor.PreferredResourceHeapSize == 0)
? kNoRequiredAlignment
: allocatorDescriptor.PreferredResourceHeapSize;
: std::min(allocatorDescriptor.PreferredResourceHeapSize,
caps->GetMaxResourceSize());

newDescriptor.ResourceHeapFragmentationLimit =
(allocatorDescriptor.ResourceHeapFragmentationLimit > 0)
Expand Down