Skip to content

Fix max resource heap tier from being incorrectly reported. #609

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
Sep 9, 2022
Merged

Fix max resource heap tier from being incorrectly reported. #609

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
5 changes: 3 additions & 2 deletions src/gpgmm/d3d12/CapsD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace gpgmm::d3d12 {
return S_OK;
}

HRESULT GetMaxResourceHeapTierSupported(ID3D12Device* device,
HRESULT SetMaxResourceHeapTierSupported(ID3D12Device* device,
D3D12_RESOURCE_HEAP_TIER* maxResourceHeapTierOut) {
D3D12_FEATURE_DATA_D3D12_OPTIONS options = {};
ReturnIfFailed(
Expand All @@ -87,6 +87,7 @@ namespace gpgmm::d3d12 {
std::unique_ptr<Caps> caps(new Caps());
ReturnIfFailed(SetMaxResourceSize(device, &caps->mMaxResourceSize));
ReturnIfFailed(SetMaxResourceHeapSize(device, &caps->mMaxResourceHeapSize));
ReturnIfFailed(SetMaxResourceHeapTierSupported(device, &caps->mMaxResourceHeapTier));
ReturnIfFailed(
SetCreateHeapNotResidentSupported(device, &caps->mIsCreateHeapNotResidentSupported));

Expand Down Expand Up @@ -150,7 +151,7 @@ namespace gpgmm::d3d12 {
return mIsAdapterCacheCoherentUMA;
}

bool Caps::GetMaxResourceHeapTierSupported() const {
D3D12_RESOURCE_HEAP_TIER Caps::GetMaxResourceHeapTierSupported() const {
return mMaxResourceHeapTier;
}

Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/CapsD3D12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace gpgmm::d3d12 {
bool IsAdapterCacheCoherentUMA() const;

// Specifies if a texture and buffer can belong in the same heap.
bool GetMaxResourceHeapTierSupported() const;
D3D12_RESOURCE_HEAP_TIER GetMaxResourceHeapTierSupported() const;

private:
Caps() = default;
Expand Down