[D3D12] Nicer DeferredCommandList uintmax_t alignment

This commit is contained in:
Triang3l
2020-10-03 14:12:30 +03:00
parent 1014458783
commit 6cb8f0aab4
2 changed files with 33 additions and 25 deletions

View File

@@ -11,6 +11,7 @@
#define XENIA_GPU_D3D12_DEFERRED_COMMAND_LIST_H_
#include <algorithm>
#include <cstdint>
#include <cstring>
#include <vector>
@@ -26,7 +27,7 @@ class D3D12CommandProcessor;
class DeferredCommandList {
public:
DeferredCommandList(D3D12CommandProcessor& command_processor,
size_t initial_size = 256 * 1024);
size_t initial_size_bytes = 1024 * 1024);
void Reset();
void Execute(ID3D12GraphicsCommandList* command_list,
@@ -332,8 +333,6 @@ class DeferredCommandList {
}
private:
static constexpr size_t kAlignment = std::max(sizeof(void*), sizeof(UINT64));
enum class Command : uint32_t {
kD3DClearUnorderedAccessViewUint,
kD3DCopyBufferRegion,
@@ -365,6 +364,13 @@ class DeferredCommandList {
kD3DSetSamplePositions,
};
struct CommandHeader {
Command command;
uint32_t arguments_size_elements;
};
static constexpr size_t kCommandHeaderSizeElements =
(sizeof(CommandHeader) + sizeof(uintmax_t) - 1) / sizeof(uintmax_t);
struct ClearUnorderedAccessViewHeader {
D3D12_GPU_DESCRIPTOR_HANDLE view_gpu_handle_in_current_heap;
D3D12_CPU_DESCRIPTOR_HANDLE view_cpu_handle;
@@ -460,11 +466,12 @@ class DeferredCommandList {
D3D12_SAMPLE_POSITION sample_positions[16];
};
void* WriteCommand(Command command, size_t arguments_size);
void* WriteCommand(Command command, size_t arguments_size_bytes);
D3D12CommandProcessor& command_processor_;
std::vector<uint8_t> command_stream_;
// uintmax_t to ensure uint64_t and pointer alignment of all structures.
std::vector<uintmax_t> command_stream_;
};
} // namespace d3d12