jacob/power_play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ByteAddressBuffer support to gpu layer

Browse Source
This commit is contained in:
jacob 2025-12-08 14:12:51 -06:00
parent 9e8dcba2d3
commit 2f915de96c
19 changed files with 215 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/base.h
View File

@ -433,7 +433,11 @@
#define sizeof_field(type, field) sizeof(((type *)0)->field) #define sizeof_field(type, field) sizeof(((type *)0)->field)
//- countof //- countof
#if IsLanguageC
#define countof(a) (sizeof(a) / sizeof((a)[0])) #define countof(a) (sizeof(a) / sizeof((a)[0]))
#elif IsLanguageHlsl
template<typename T, uint N> uint countof(T ints[N]) { return N; }
#endif
//- IsArray //- IsArray
#define IsIndexable(a) (sizeof(a[0]) != 0) #define IsIndexable(a) (sizeof(a[0]) != 0)
@ -728,6 +732,8 @@
Struct(StructuredBufferHandle) { u32 v; }; Struct(StructuredBufferHandle) { u32 v; };
Struct(RWStructuredBufferHandle) { u32 v; }; Struct(RWStructuredBufferHandle) { u32 v; };
Struct(ByteAddressBufferHandle) { u32 v; };
Struct(RWByteAddressBufferHandle) { u32 v; };
Struct(Texture1DHandle) { u32 v; }; Struct(Texture1DHandle) { u32 v; };
Struct(RWTexture1DHandle) { u32 v; }; Struct(RWTexture1DHandle) { u32 v; };
Struct(Texture2DHandle) { u32 v; }; Struct(Texture2DHandle) { u32 v; };

7
src/base/base_gpu.hlsl
View File

@ -29,12 +29,17 @@ typedef float4x4 Mat4x4;
template<typename T> StructuredBuffer<T> StructuredBufferFromHandle(StructuredBufferHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; } template<typename T> StructuredBuffer<T> StructuredBufferFromHandle(StructuredBufferHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> RWStructuredBuffer<T> RWStructuredBufferFromHandle(RWStructuredBufferHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; } template<typename T> RWStructuredBuffer<T> RWStructuredBufferFromHandle(RWStructuredBufferHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
ByteAddressBuffer ByteAddressBufferFromHandle(ByteAddressBufferHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
RWByteAddressBuffer RWByteAddressBufferFromHandle(RWByteAddressBufferHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> Texture1D<T> Texture1DFromHandle(Texture1DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; } template<typename T> Texture1D<T> Texture1DFromHandle(Texture1DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> Texture3D<T> Texture3DFromHandle(Texture3DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> RWTexture1D<T> RWTexture1DFromHandle(RWTexture1DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; } template<typename T> RWTexture1D<T> RWTexture1DFromHandle(RWTexture1DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> Texture2D<T> Texture2DFromHandle(Texture2DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; } template<typename T> Texture2D<T> Texture2DFromHandle(Texture2DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> RWTexture2D<T> RWTexture2DFromHandle(RWTexture2DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; } template<typename T> RWTexture2D<T> RWTexture2DFromHandle(RWTexture2DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> Texture3D<T> Texture3DFromHandle(Texture3DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
template<typename T> RWTexture3D<T> RWTexture3DFromHandle(RWTexture3DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; } template<typename T> RWTexture3D<T> RWTexture3DFromHandle(RWTexture3DHandle h) { return ResourceDescriptorHeap[NonUniformResourceIndex(h.v)]; }
SamplerState SamplerStateFromHandle(SamplerStateHandle h) { return SamplerDescriptorHeap[NonUniformResourceIndex(h.v)]; } SamplerState SamplerStateFromHandle(SamplerStateHandle h) { return SamplerDescriptorHeap[NonUniformResourceIndex(h.v)]; }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

17
src/base/base_string.c
View File

@ -518,8 +518,7 @@ String TrimWhitespace(String s)
* Example: * Example:
* FormatString(arena, Lit("Hello there %F"), FmtString(Lit("George"))) * FormatString(arena, Lit("Hello there %F"), FmtString(Lit("George")))
* *
* NOTE: FmtEnd must be passed as the last arg in the va_list (this is * NOTE: FmtEnd must be passed as the last arg in the va_list
* done automatically by the `FormatString` macro).
* *
* Format arguments: * Format arguments:
* FmtChar: Format a single u8 character * FmtChar: Format a single u8 character
@ -527,16 +526,10 @@ String TrimWhitespace(String s)
* FmtUint: Format a u64 * FmtUint: Format a u64
* FmtSint: Format an i64 * FmtSint: Format an i64
* FmtFloat: Format an f64 with DefaultFmtPrecision * FmtFloat: Format an f64 with DefaultFmtPrecision
* FmtFloatP: Format an f64 with specified precision
* FmtHex: Format a u64 in hexadecimal notation * FmtHex: Format a u64 in hexadecimal notation
* FmtPtr: Format a pointer in hexadecimal notation prefixed by "0x" * FmtPtr: Format a pointer in hexadecimal notation prefixed by "0x"
* *
* FmtEnd (internal): Denote the end of the va_list * FmtEnd (internal): Denote the end of the va_list
*
* TODO:
* %n equivalent? (nothing)
* %e/%E equivalent? (scientific notation of floats)
* %o equivalent? (octal representation)
*/ */
String FormatStringV(Arena *arena, String fmt, va_list args) String FormatStringV(Arena *arena, String fmt, va_list args)
{ {
@ -584,17 +577,17 @@ String FormatStringV(Arena *arena, String fmt, va_list args)
case FmtKind_Uint: case FmtKind_Uint:
{ {
parsed_str = StringFromU64(arena, arg.value.uint, 10, arg.zfill); parsed_str = StringFromU64(arena, arg.value.uint, 10, arg.z);
} break; } break;
case FmtKind_Sint: case FmtKind_Sint:
{ {
parsed_str = StringFromI64(arena, arg.value.sint, 10, arg.zfill); parsed_str = StringFromI64(arena, arg.value.sint, 10, arg.z);
} break; } break;
case FmtKind_Hex: case FmtKind_Hex:
{ {
parsed_str = StringFromU64(arena, arg.value.sint, 16, arg.zfill); parsed_str = StringFromU64(arena, arg.value.sint, 16, arg.z);
} break; } break;
case FmtKind_Ptr: case FmtKind_Ptr:
@ -604,7 +597,7 @@ String FormatStringV(Arena *arena, String fmt, va_list args)
case FmtKind_Float: case FmtKind_Float:
{ {
parsed_str = StringFromF64(arena, arg.value.f, arg.precision); parsed_str = StringFromF64(arena, arg.value.f, arg.p);
} break; } break;
case FmtKind_Handle: case FmtKind_Handle:

30
src/base/base_string.h
View File

@ -25,8 +25,8 @@ Enum(FmtKind)
Struct(FmtArg) Struct(FmtArg)
{ {
FmtKind kind; FmtKind kind;
u32 precision; u32 p; /* Precision */
u32 zfill; u32 z; /* Z-fill */
union union
{ {
u8 c; u8 c;
@ -98,21 +98,19 @@ String StringFromList(Arena *arena, StringList l, String separator);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ Formatting //~ Formatting
//- Format arg helpers #define FMTARG(_kind, ...) ((FmtArg) { .kind = (_kind), .p = DefaultFmtPrecision, __VA_ARGS__ })
#define FmtChar(v) (FmtArg) {.kind = FmtKind_Char, .value.c = (v)}
#define FmtString(v) (FmtArg) {.kind = FmtKind_String, .value.string = (v)} #define FmtChar(v, ...) FMTARG(FmtKind_Char, .value.c = (v), __VA_ARGS__)
#define FmtUint(v) (FmtArg) {.kind = FmtKind_Uint, .value.uint = (v)} #define FmtString(v, ...) FMTARG(FmtKind_String, .value.string = (v), __VA_ARGS__)
#define FmtUintZ(v, z) (FmtArg) {.kind = FmtKind_Uint, .value.uint = (v), .zfill = (z)} #define FmtUint(v, ...) FMTARG(FmtKind_Uint, .value.uint = (v), __VA_ARGS__)
#define FmtSint(v) (FmtArg) {.kind = FmtKind_Sint, .value.sint = (v)} #define FmtSint(v, ...) FMTARG(FmtKind_Sint, .value.sint = (v), __VA_ARGS__)
#define FmtHex(v) (FmtArg) {.kind = FmtKind_Hex, .value.uint = (v)} #define FmtHex(v, ...) FMTARG(FmtKind_Hex, .value.uint = (v), __VA_ARGS__)
#define FmtPtr(v) (FmtArg) {.kind = FmtKind_Ptr, .value.ptr = (v)} #define FmtPtr(v, ...) FMTARG(FmtKind_Ptr, .value.ptr = (v), __VA_ARGS__)
#define FmtFloat(v) FmtFloatP(v, DefaultFmtPrecision) #define FmtFloat(v, ...) FMTARG(FmtKind_Float, .value.f = (v), __VA_ARGS__)
#define FmtFloatP(v, p) (FmtArg) {.kind = FmtKind_Float, .value.f = (v), .precision = (p)} #define FmtHandle(v, ...) FMTARG(FmtKind_Handle, .value.handle.h64[0] = (v).idx, .value.handle.h64[1] = (v).gen, __VA_ARGS__)
#define FmtHandle(v) (FmtArg) {.kind = FmtKind_Handle, .value.handle.h64[0] = (v).idx, .value.handle.h64[1] = (v).gen} #define FmtUid(v, ...) FMTARG(FmtKind_Uid, .value.uid = (v), __VA_ARGS__)
#define FmtUid(v) (FmtArg) {.kind = FmtKind_Uid, .value.uid = (v) } #define FmtEnd FMTARG(FmtKind_End) /* Denotes end of VA list */
#define FmtEnd (FmtArg) {.kind = FmtKind_End}
//- Format functions
#define StringF(arena, lit, ...) FormatString_((arena), Lit(lit), __VA_ARGS__, FmtEnd) #define StringF(arena, lit, ...) FormatString_((arena), Lit(lit), __VA_ARGS__, FmtEnd)
#define FormatString(arena, fmt, ...) FormatString_((arena), (fmt), __VA_ARGS__, FmtEnd) #define FormatString(arena, fmt, ...) FormatString_((arena), (fmt), __VA_ARGS__, FmtEnd)
String FormatString_(Arena *arena, String fmt, ...); String FormatString_(Arena *arena, String fmt, ...);

10
src/base/base_win32/base_win32_log.c
View File

@ -55,13 +55,13 @@ void W32_Log(i32 level, String msg)
"[%F:%F:%F.%F] <%F> [%F] %F\n", "[%F:%F:%F.%F] <%F> [%F] %F\n",
/* Time */ /* Time */
FmtUintZ(datetime.hour, 2), FmtUint(datetime.hour, .z = 2),
FmtUintZ(datetime.minute, 2), FmtUint(datetime.minute, .z = 2),
FmtUintZ(datetime.second, 2), FmtUint(datetime.second, .z = 2),
FmtUintZ(datetime.milliseconds, 3), FmtUint(datetime.milliseconds, .z = 3),
/* Thread id */ /* Thread id */
FmtUintZ(thread_id, 5), FmtUint(thread_id, .z = 5),
/* Level */ /* Level */
FmtString(shorthand), FmtString(shorthand),

2
src/config.h
View File

@ -70,7 +70,7 @@
#define FLOOD_DEBUG 0 #define FLOOD_DEBUG 0
#define GPU_DEBUG 1 #define GPU_DEBUG 1
#define GPU_DEBUG_VALIDATION 1 #define GPU_DEBUG_VALIDATION 0
/* If enabled, bitbuffs will insert/verify magic numbers & length for each read & write */ /* If enabled, bitbuffs will insert/verify magic numbers & length for each read & write */
#define BITBUFF_DEBUG 0 #define BITBUFF_DEBUG 0

7
src/gpu/gpu.lay
View File

@ -5,10 +5,11 @@
//- Api //- Api
@IncludeC gpu_core.h @IncludeC gpu_core.h
@IncludeC gpu_common.h @IncludeC gpu_extras.h
//- Impl //- Impl
@IncludeC gpu_common.c @IncludeC gpu_extras.c
@IncludeGpu gpu_shader_extras.hlsl
//- Dx12 impl //- Dx12 impl
@DefaultWindowsImpl gpu_dx12 @DefaultWindowsImpl gpu_dx12
@ -18,4 +19,4 @@
//- Startup //- Startup
@Startup GPU_Startup @Startup GPU_Startup
@Startup GPU_StartupCommon @Startup GPU_StartupExtra

13
src/gpu/gpu_core.h
View File

@ -543,8 +543,10 @@ GPU_ResourceHandle GPU_PushSampler(GPU_ArenaHandle arena, GPU_SamplerDesc desc);
//- Shader handle creation //- Shader handle creation
StructuredBufferHandle GPU_PushStructuredBufferHandleEx (GPU_ArenaHandle arena, GPU_ResourceHandle resource, u32 element_size, RngU32 element_range); StructuredBufferHandle GPU_PushStructuredBufferHandleEx (GPU_ArenaHandle arena, GPU_ResourceHandle resource, u64 element_size, u64 element_offset);
RWStructuredBufferHandle GPU_PushRWStructuredBufferHandleEx (GPU_ArenaHandle arena, GPU_ResourceHandle resource, u32 element_size, RngU32 element_range); RWStructuredBufferHandle GPU_PushRWStructuredBufferHandleEx (GPU_ArenaHandle arena, GPU_ResourceHandle resource, u64 element_size, u64 element_offset);
ByteAddressBufferHandle GPU_PushByteAddressBufferHandleEx (GPU_ArenaHandle arena, GPU_ResourceHandle resource, u64 u32_offset);
RWByteAddressBufferHandle GPU_PushRWByteAddressBufferHandleEx (GPU_ArenaHandle arena, GPU_ResourceHandle resource, u64 u32_offset);
Texture1DHandle GPU_PushTexture1DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource); Texture1DHandle GPU_PushTexture1DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource);
RWTexture1DHandle GPU_PushRWTexture1DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource); RWTexture1DHandle GPU_PushRWTexture1DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource);
Texture2DHandle GPU_PushTexture2DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource); Texture2DHandle GPU_PushTexture2DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource);
@ -553,8 +555,11 @@ Texture3DHandle GPU_PushTexture3DHandle (GPU_ArenaHandle
RWTexture3DHandle GPU_PushRWTexture3DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource); RWTexture3DHandle GPU_PushRWTexture3DHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource);
SamplerStateHandle GPU_PushSamplerStateHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource); SamplerStateHandle GPU_PushSamplerStateHandle (GPU_ArenaHandle arena, GPU_ResourceHandle resource);
#define GPU_PushStructuredBufferHandle(arena, resource, type) GPU_PushStructuredBufferHandleEx((arena), (resource), sizeof(type), RNGU32(0, GPU_CountBuffer((resource), type))) #define GPU_PushStructuredBufferHandle(arena, resource, type) GPU_PushStructuredBufferHandleEx((arena), (resource), sizeof(type), 0)
#define GPU_PushRWStructuredBufferHandle(arena, resource, type) GPU_PushRWStructuredBufferHandleEx((arena), (resource), sizeof(type), RNGU32(0, GPU_CountBuffer((resource), type))) #define GPU_PushRWStructuredBufferHandle(arena, resource, type) GPU_PushRWStructuredBufferHandleEx((arena), (resource), sizeof(type), 0)
#define GPU_PushByteAddressBufferHandle(arena, resource) GPU_PushByteAddressBufferHandleEx((arena), (resource), 0)
#define GPU_PushRWByteAddressBufferHandle(arena, resource) GPU_PushRWByteAddressBufferHandleEx((arena), (resource), 0)
//- Index buffer creation //- Index buffer creation

163
src/gpu/gpu_dx12/gpu_dx12.c
View File

@ -691,54 +691,6 @@ void GPU_D12_CommitRawCommandList(GPU_D12_RawCommandList *cl)
} }
} }
////////////////////////////////////////////////////////////
//~ Queue sync job
// JobImpl(GPU_D12_StartQueueSync, _, __)
// {
// GPU_D12_SharedState *g = &GPU_D12_shared_state;
// HANDLE queue_fences_events[GPU_NumQueues] = ZI;
// i64 queue_fences_seen[GPU_NumQueues] = ZI;
// for (i32 i = 0; i < countof(queue_fences_events); ++i)
// {
// queue_fences_events[i] = CreateEvent(0, 0, 1, 0);
// queue_fences_seen[i] = -1;
// }
// for (;;)
// {
// WaitForMultipleObjects(countof(queue_fences_events), queue_fences_events, 0, INFINITE);
// for (GPU_QueueKind queue_kind = 0; queue_kind < GPU_NumQueues; ++queue_kind)
// {
// GPU_D12_Queue *queue = GPU_D12_QueueFromKind(queue_kind);
// i64 last_seen = queue_fences_seen[queue_kind];
// i64 completed = ID3D12Fence_GetCompletedValue(queue->commit_fence);
// if (completed > last_seen)
// {
// SetFence(&queue->sync_fence, completed);
// queue_fences_seen[queue_kind] = completed;
// ID3D12Fence_SetEventOnCompletion(queue->commit_fence, completed + 1, queue_fences_events[queue_kind]);
// }
// }
// }
// }
////////////////////////////////////////////////////////////
//~ @hookimpl Fence hooks
// Fence *GPU_FenceFromQueue(GPU_QueueKind queue_kind)
// {
// GPU_D12_Queue *queue = GPU_D12_QueueFromKind(queue_kind);
// return &queue->sync_fence;
// }
// void GPU_QueueWait(GPU_QueueKind a, GPU_QueueKind b, i64 b_target_fence_value)
// {
// GPU_D12_Queue *queue_a = GPU_D12_QueueFromKind(a);
// GPU_D12_Queue *queue_b = GPU_D12_QueueFromKind(b);
// ID3D12Fence *b_fence = queue_b->commit_fence;
// ID3D12CommandQueue_Wait(queue_a->d3d_queue, b_fence, b_target_fence_value);
// }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ @hookimpl Arena //~ @hookimpl Arena
@ -764,6 +716,14 @@ void GPU_ReleaseArena(GPU_ArenaHandle arena)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ Resource helpers //~ Resource helpers
GPU_D12_Descriptor *GPU_D12_DescriptorFromIndex(GPU_D12_DescriptorHeapKind heap_kind, u32 index)
{
GPU_D12_SharedState *g = &GPU_D12_shared_state;
GPU_D12_DescriptorHeap *heap = &g->descriptor_heaps[heap_kind];
GPU_D12_Descriptor *descriptors = ArenaFirst(heap->descriptors_arena, GPU_D12_Descriptor);
return &descriptors[index];
}
GPU_D12_Descriptor *GPU_D12_PushDescriptor(GPU_D12_Arena *gpu_arena, GPU_D12_DescriptorHeapKind heap_kind) GPU_D12_Descriptor *GPU_D12_PushDescriptor(GPU_D12_Arena *gpu_arena, GPU_D12_DescriptorHeapKind heap_kind)
{ {
GPU_D12_SharedState *g = &GPU_D12_shared_state; GPU_D12_SharedState *g = &GPU_D12_shared_state;
@ -812,7 +772,7 @@ GPU_D12_Descriptor *GPU_D12_PushDescriptor(GPU_D12_Arena *gpu_arena, GPU_D12_Des
else else
{ {
descriptor = PushStructNoZero(heap->descriptors_arena, GPU_D12_Descriptor); descriptor = PushStructNoZero(heap->descriptors_arena, GPU_D12_Descriptor);
index = heap->allocated_count++; index = ArenaCount(heap->descriptors_arena, GPU_D12_Descriptor);
if (index >= heap->max_count) if (index >= heap->max_count)
{ {
Panic(Lit("Max descriptors reached in heap")); Panic(Lit("Max descriptors reached in heap"));
@ -831,12 +791,52 @@ GPU_D12_Descriptor *GPU_D12_PushDescriptor(GPU_D12_Arena *gpu_arena, GPU_D12_Des
return descriptor; return descriptor;
} }
GPU_D12_Descriptor *GPU_D12_DescriptorFromIndex(GPU_D12_DescriptorHeapKind heap_kind, u32 index) void GPU_D12_InitBufferDescriptor(GPU_D12_Descriptor *descriptor, GPU_D12_Resource *resource, u64 element_size, u64 element_offset, b32 is_raw, b32 is_uav)
{ {
GPU_D12_SharedState *g = &GPU_D12_shared_state; GPU_D12_SharedState *g = &GPU_D12_shared_state;
GPU_D12_DescriptorHeap *heap = &g->descriptor_heaps[heap_kind]; u64 buffer_size_aligned = resource->buffer_size_aligned;
GPU_D12_Descriptor *descriptors = ArenaFirst(heap->descriptors_arena, GPU_D12_Descriptor); u64 num_elements_in_buffer = buffer_size_aligned / element_size;
return &descriptors[index]; u64 num_elements_after_offset = num_elements_in_buffer > element_offset ? num_elements_in_buffer - element_offset : 0;
if (num_elements_after_offset > 0)
{
if (is_uav)
{
D3D12_UNORDERED_ACCESS_VIEW_DESC desc = ZI;
{
desc.Format = DXGI_FORMAT_UNKNOWN;
desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER ;
desc.Buffer.FirstElement = element_offset;
desc.Buffer.NumElements = num_elements_after_offset;
desc.Buffer.StructureByteStride = element_size;
desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE;
}
if (is_raw)
{
desc.Format = DXGI_FORMAT_R32_TYPELESS;
desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_RAW;
}
ID3D12Device_CreateUnorderedAccessView(g->device, resource->d3d_resource, 0, &desc, descriptor->handle);
}
else
{
D3D12_SHADER_RESOURCE_VIEW_DESC desc = ZI;
{
desc.Format = DXGI_FORMAT_UNKNOWN;
desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
desc.Buffer.FirstElement = element_offset;
desc.Buffer.NumElements = num_elements_after_offset;
desc.Buffer.StructureByteStride = element_size;
desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_NONE;
}
if (is_raw)
{
desc.Format = DXGI_FORMAT_R32_TYPELESS;
desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW;
}
ID3D12Device_CreateShaderResourceView(g->device, resource->d3d_resource, &desc, descriptor->handle);
}
}
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -873,12 +873,13 @@ GPU_ResourceHandle GPU_PushBufferEx(GPU_ArenaHandle arena_handle, GPU_BufferDesc
/* Create d3d resource */ /* Create d3d resource */
ID3D12Resource *d3d_resource = 0; ID3D12Resource *d3d_resource = 0;
u64 aligned_size = AlignU64(MaxU64(desc.size, 1), 4);
{ {
D3D12_RESOURCE_DESC1 d3d_desc = ZI; D3D12_RESOURCE_DESC1 d3d_desc = ZI;
d3d_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; d3d_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;
d3d_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; d3d_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
d3d_desc.Format = DXGI_FORMAT_UNKNOWN; d3d_desc.Format = DXGI_FORMAT_UNKNOWN;
d3d_desc.Width = MaxI32(desc.size, 1); d3d_desc.Width = aligned_size;
d3d_desc.Height = 1; d3d_desc.Height = 1;
d3d_desc.DepthOrArraySize = 1; d3d_desc.DepthOrArraySize = 1;
d3d_desc.MipLevels = 1; d3d_desc.MipLevels = 1;
@ -922,6 +923,7 @@ GPU_ResourceHandle GPU_PushBufferEx(GPU_ArenaHandle arena_handle, GPU_BufferDesc
resource->flags = desc.flags; resource->flags = desc.flags;
resource->buffer_size = desc.size; resource->buffer_size = desc.size;
resource->buffer_size_aligned = aligned_size;
resource->buffer_gpu_address = ID3D12Resource_GetGPUVirtualAddress(d3d_resource); resource->buffer_gpu_address = ID3D12Resource_GetGPUVirtualAddress(d3d_resource);
return GPU_D12_MakeHandle(GPU_ResourceHandle, resource); return GPU_D12_MakeHandle(GPU_ResourceHandle, resource);
@ -1039,46 +1041,44 @@ GPU_ResourceHandle GPU_PushSampler(GPU_ArenaHandle arena_handle, GPU_SamplerDesc
//- Shader handle creation //- Shader handle creation
StructuredBufferHandle GPU_PushStructuredBufferHandleEx(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle, u32 element_size, RngU32 element_range) StructuredBufferHandle GPU_PushStructuredBufferHandleEx(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle, u64 element_size, u64 element_offset)
{ {
GPU_D12_SharedState *g = &GPU_D12_shared_state; GPU_D12_SharedState *g = &GPU_D12_shared_state;
u32 num_elements = element_range.max - element_range.min;
StructuredBufferHandle result = ZI;
if (num_elements > 0)
{
GPU_D12_Arena *gpu_arena = GPU_D12_ArenaFromHandle(arena_handle); GPU_D12_Arena *gpu_arena = GPU_D12_ArenaFromHandle(arena_handle);
GPU_D12_Resource *resource = GPU_D12_ResourceFromHandle(resource_handle); GPU_D12_Resource *resource = GPU_D12_ResourceFromHandle(resource_handle);
GPU_D12_Descriptor *descriptor = GPU_D12_PushDescriptor(gpu_arena, GPU_D12_DescriptorHeapKind_CbvSrvUav); GPU_D12_Descriptor *descriptor = GPU_D12_PushDescriptor(gpu_arena, GPU_D12_DescriptorHeapKind_CbvSrvUav);
{ GPU_D12_InitBufferDescriptor(descriptor, resource, element_size, element_offset, 0, 0);
D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc = ZI; return GPU_D12_MakeHandle(StructuredBufferHandle, descriptor->index);
srv_desc.Format = DXGI_FORMAT_UNKNOWN;
srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER;
srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING;
srv_desc.Buffer.FirstElement = element_range.min;
srv_desc.Buffer.NumElements = MaxU32(num_elements, 1);
srv_desc.Buffer.StructureByteStride = element_size;
srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_NONE;
ID3D12Device_CreateShaderResourceView(g->device, resource->d3d_resource, &srv_desc, descriptor->handle);
}
result = GPU_D12_MakeHandle(StructuredBufferHandle, descriptor->index);
}
return result;
} }
RWStructuredBufferHandle GPU_PushRWStructuredBufferHandleEx(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle, u32 element_size, RngU32 element_range) RWStructuredBufferHandle GPU_PushRWStructuredBufferHandleEx(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle, u64 element_size, u64 element_offset)
{ {
GPU_D12_SharedState *g = &GPU_D12_shared_state; GPU_D12_SharedState *g = &GPU_D12_shared_state;
u32 num_elements = element_range.max - element_range.min;
RWStructuredBufferHandle result = ZI;
if (num_elements > 0)
{
GPU_D12_Arena *gpu_arena = GPU_D12_ArenaFromHandle(arena_handle); GPU_D12_Arena *gpu_arena = GPU_D12_ArenaFromHandle(arena_handle);
GPU_D12_Resource *resource = GPU_D12_ResourceFromHandle(resource_handle); GPU_D12_Resource *resource = GPU_D12_ResourceFromHandle(resource_handle);
GPU_D12_Descriptor *descriptor = GPU_D12_PushDescriptor(gpu_arena, GPU_D12_DescriptorHeapKind_CbvSrvUav); GPU_D12_Descriptor *descriptor = GPU_D12_PushDescriptor(gpu_arena, GPU_D12_DescriptorHeapKind_CbvSrvUav);
ID3D12Device_CreateUnorderedAccessView(g->device, resource->d3d_resource, 0, 0, descriptor->handle); GPU_D12_InitBufferDescriptor(descriptor, resource, element_size, element_offset, 0, 1);
result = GPU_D12_MakeHandle(RWStructuredBufferHandle, descriptor->index); return GPU_D12_MakeHandle(RWStructuredBufferHandle, descriptor->index);
} }
return result;
ByteAddressBufferHandle GPU_PushByteAddressBufferHandleEx(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle, u64 u32_offset)
{
GPU_D12_SharedState *g = &GPU_D12_shared_state;
GPU_D12_Arena *gpu_arena = GPU_D12_ArenaFromHandle(arena_handle);
GPU_D12_Resource *resource = GPU_D12_ResourceFromHandle(resource_handle);
GPU_D12_Descriptor *descriptor = GPU_D12_PushDescriptor(gpu_arena, GPU_D12_DescriptorHeapKind_CbvSrvUav);
GPU_D12_InitBufferDescriptor(descriptor, resource, 4, u32_offset, 1, 0);
return GPU_D12_MakeHandle(ByteAddressBufferHandle, descriptor->index);
}
RWByteAddressBufferHandle GPU_PushRWByteAddressBufferHandleEx(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle, u64 u32_offset)
{
GPU_D12_SharedState *g = &GPU_D12_shared_state;
GPU_D12_Arena *gpu_arena = GPU_D12_ArenaFromHandle(arena_handle);
GPU_D12_Resource *resource = GPU_D12_ResourceFromHandle(resource_handle);
GPU_D12_Descriptor *descriptor = GPU_D12_PushDescriptor(gpu_arena, GPU_D12_DescriptorHeapKind_CbvSrvUav);
GPU_D12_InitBufferDescriptor(descriptor, resource, 4, u32_offset, 1, 1);
return GPU_D12_MakeHandle(RWByteAddressBufferHandle, descriptor->index);
} }
Texture1DHandle GPU_PushTexture1DHandle(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle) Texture1DHandle GPU_PushTexture1DHandle(GPU_ArenaHandle arena_handle, GPU_ResourceHandle resource_handle)
@ -1416,6 +1416,7 @@ GPU_D12_StagingRegionNode *GPU_D12_PushStagingRegion(GPU_D12_CmdList *cl, u64 si
heap->resource.d3d_resource = d3d_resource; heap->resource.d3d_resource = d3d_resource;
heap->resource.uid = Atomic64FetchAdd(&g->resource_creation_gen.v, 1) + 1; heap->resource.uid = Atomic64FetchAdd(&g->resource_creation_gen.v, 1) + 1;
heap->resource.buffer_size = new_heap_size; heap->resource.buffer_size = new_heap_size;
heap->resource.buffer_size_aligned = new_heap_size;
heap->resource.buffer_gpu_address = ID3D12Resource_GetGPUVirtualAddress(d3d_resource); heap->resource.buffer_gpu_address = ID3D12Resource_GetGPUVirtualAddress(d3d_resource);
/* Map */ /* Map */

5
src/gpu/gpu_dx12/gpu_dx12.h
View File

@ -78,7 +78,6 @@ Struct(GPU_D12_DescriptorHeap)
Mutex mutex; Mutex mutex;
struct GPU_D12_Descriptor *first_free; struct GPU_D12_Descriptor *first_free;
u32 allocated_count;
u32 max_count; u32 max_count;
}; };
@ -130,6 +129,7 @@ Struct(GPU_D12_Resource)
/* Buffer info */ /* Buffer info */
u64 buffer_size; u64 buffer_size;
u64 buffer_size_aligned;
D3D12_GPU_VIRTUAL_ADDRESS buffer_gpu_address; D3D12_GPU_VIRTUAL_ADDRESS buffer_gpu_address;
/* Texture info */ /* Texture info */
@ -411,8 +411,9 @@ GPU_D12_Queue *GPU_D12_QueueFromKind(GPU_QueueKind kind);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ Resource helpers //~ Resource helpers
GPU_D12_Descriptor *GPU_D12_PushDescriptor(GPU_D12_Arena *gpu_arena, GPU_D12_DescriptorHeapKind heap_kind);
GPU_D12_Descriptor *GPU_D12_DescriptorFromIndex(GPU_D12_DescriptorHeapKind heap_kind, u32 index); GPU_D12_Descriptor *GPU_D12_DescriptorFromIndex(GPU_D12_DescriptorHeapKind heap_kind, u32 index);
GPU_D12_Descriptor *GPU_D12_PushDescriptor(GPU_D12_Arena *gpu_arena, GPU_D12_DescriptorHeapKind heap_kind);
void GPU_D12_InitBufferDescriptor(GPU_D12_Descriptor *descriptor, GPU_D12_Resource *resource, u64 element_size, u64 element_offset, b32 is_raw, b32 is_uav);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ Raw command list //~ Raw command list

2
src/gpu/gpu_common.c → src/gpu/gpu_extras.c
View File

@ -4,7 +4,7 @@ ThreadLocal GPU_ArenaHandle GPU_t_perm_arena = ZI;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ Startup //~ Startup
void GPU_StartupCommon(void) void GPU_StartupExtra(void)
{ {
GPU_SharedUtilState *g = &GPU_shared_util_state; GPU_SharedUtilState *g = &GPU_shared_util_state;

2
src/gpu/gpu_common.h → src/gpu/gpu_extras.h
View File

@ -14,7 +14,7 @@ extern ThreadLocal GPU_ArenaHandle GPU_t_perm_arena;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ Startup //~ Startup
void GPU_StartupCommon(void); void GPU_StartupExtra(void);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
//~ Helpers //~ Helpers

14
src/gpu/gpu_shader_extras.hlsl Normal file
View File

@ -0,0 +1,14 @@
////////////////////////////////////////////////////////////
//~ Shader printf types
////////////////////////////////////////////////////////////
//~ Shader printf
// #define Test(fmt_cstr, ...) do { \
// } while (0)
void Test(u32 count)
{
}

8
src/pp/pp_vis/pp_vis_widgets.c
View File

@ -374,10 +374,10 @@ UI_Key V_BuildConsoleWidget(b32 minimized)
text = StringF( text = StringF(
scratch.arena, scratch.arena,
"[%F:%F:%F.%F] %F", "[%F:%F:%F.%F] %F",
FmtUintZ(datetime.hour, 2), FmtUint(datetime.hour, .z = 2),
FmtUintZ(datetime.minute, 2), FmtUint(datetime.minute, .z = 2),
FmtUintZ(datetime.second, 2), FmtUint(datetime.second, .z = 2),
FmtUintZ(datetime.milliseconds, 3), FmtUint(datetime.milliseconds, .z = 3),
FmtString(text)); FmtString(text));
} }
UI_PushCP(UI_NilKey); UI_PushCP(UI_NilKey);

4
src/ui/ui.lay
View File

@ -7,13 +7,13 @@
//- Api //- Api
@IncludeC ui_core.h @IncludeC ui_core.h
@IncludeC ui_common.h @IncludeC ui_extras.h
@IncludeC ui_shaders.h @IncludeC ui_shaders.h
@IncludeGpu ui_shaders.h @IncludeGpu ui_shaders.h
//- Impl //- Impl
@IncludeC ui_core.c @IncludeC ui_core.c
@IncludeC ui_common.c @IncludeC ui_extras.c
@IncludeGpu ui_shaders.hlsl @IncludeGpu ui_shaders.hlsl
//- Shaders //- Shaders

2
src/ui/ui_core.c
View File

@ -1405,7 +1405,7 @@ void UI_EndFrame(UI_Frame *frame)
//- Clear pass //- Clear pass
{ {
GPU_ClearRenderTarget(frame->cl, draw_target, VEC4(1, 0, 0, 0)); GPU_ClearRenderTarget(frame->cl, draw_target, VEC4(1, 0, 0, 1));
} }
//- Rect pass //- Rect pass

0
src/ui/ui_common.c → src/ui/ui_extras.c
View File

0
src/ui/ui_common.h → src/ui/ui_extras.h
View File

34
src/ui/ui_shaders.hlsl
View File

@ -172,7 +172,39 @@ PixelShader(UI_BlitPS, UI_BlitPSOutput, UI_BlitPSInput input)
Vec2 uv = input.src_uv; Vec2 uv = input.src_uv;
Vec4 result = tex.Sample(sampler, uv); Vec4 result = tex.Sample(sampler, uv);
result = Vec4(1, 1, 0, 1);
u32 ints[] = {
1,
2,
3,
4
};
u32 count = countof(ints);
if (count == 4)
{
result.g = 1;
}
else
{
// result.b = 1;
}
// LogDebugF(
// "uv: (%F, %F), result: (%F, %F, %F, %F)",
// FmtFloat(uv.x),
// FmtFloat(uv.y),
// FmtFloat(result.x),
// FmtFloat(result.y),
// FmtFloat(result.z),
// FmtFloat(result.w),
// );
UI_BlitPSOutput output; UI_BlitPSOutput output;
output.SV_Target0 = result; output.SV_Target0 = result;