Add option for using custom heaps and support D3D_FEATURE_LEVEL_1_0_CORE #469
Conversation
| Microsoft::WRL::ComPtr<ID3D12Resource> CreateBuffer( | ||
| uint64_t sizeInBytes, | ||
| D3D12_CPU_PAGE_PROPERTY cpuPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE, | ||
| D3D12_MEMORY_POOL memoryPoolPreference = D3D12_MEMORY_POOL_L0, | ||
| D3D12_RESOURCE_FLAGS resourceFlags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, | ||
| uint64_t alignment = 0, | ||
| D3D12_HEAP_FLAGS heapFlags = D3D12_HEAP_FLAG_NONE); | ||
|
|
There was a problem hiding this comment.
Nice! Can you also delete the TODO on line 39? :)
| } | ||
|
|
||
| if (data.empty()) | ||
| { | ||
| // No need to create an upload resource if the source data is empty. | ||
| return defaultBuffer; | ||
| return buffer; | ||
| } | ||
|
|
There was a problem hiding this comment.
If the heap is L0 and CPU-writable, there's no need to create the extra upload heap.
| if (cpuPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE && memoryPoolPreference == D3D12_MEMORY_POOL_L0) | |
| { | |
| // Map buffer directly, if possible. | |
| void* bufferData = nullptr; | |
| THROW_IF_FAILED(buffer->Map(0, nullptr, &bufferData)); | |
| memcpy(bufferData, data.data(), data.size()); | |
| buffer->Unmap(0, nullptr); | |
| return buffer; | |
| } |
| D3D12_CPU_PAGE_PROPERTY cpuPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE, | ||
| D3D12_MEMORY_POOL memoryPoolPreference = D3D12_MEMORY_POOL_L0); |
There was a problem hiding this comment.
I would default these to D3D12_MEMORY_POOL_UNKNOWN and D3D12_MEMORY_POOL_UNKNOWN, respectively, since custom heaps are opt-in.
There was a problem hiding this comment.
Good catch - thanks. This was an artifact of a previous approach.
| } | ||
|
|
||
| std::vector<std::byte> Device::Download(Microsoft::WRL::ComPtr<ID3D12Resource> defaultBuffer) | ||
| std::vector<std::byte> Device::Download(Microsoft::WRL::ComPtr<ID3D12Resource> buffer) |
There was a problem hiding this comment.
Like upload, you can avoid the readback heap and just copy straight out of the buffer here if it's L0 and CPU-visible (call GetHeapProperties).
| @@ -119,6 +119,11 @@ CommandLineArgs::CommandLineArgs(int argc, char** argv) | |||
| "Binds input and output resources are allocated from custom heaps. Write-combined caching and system memory (L0) are used when this is specified.", | |||
| cxxopts::value<bool>() | |||
| ) | |||
| ( | |||
| "g, set_stable_power_state", | |||
There was a problem hiding this comment.
Why "g" for set_stable_power_state? I'd prefer to reserve letters for common command line options where the letter is similar to the full option name.
| @@ -233,6 +233,11 @@ void Executor::operator()(const Model::DispatchCommand& command) | |||
| { | |||
| Timer loopTimer, iterationTimer, bindTimer, dispatchTimer; | |||
|
|
|||
| if (m_commandLineArgs.GetSetStablePowerState()) | |||
| { | |||
| THROW_IF_FAILED(m_device->D3D()->SetStablePowerState(TRUE)); | |||
There was a problem hiding this comment.
Instead of throwing, can you log a warning or error that dev mode needs to be enabled?
No description provided.