diff --git a/src/gpu/gpu_dx12/gpu_dx12_core.c b/src/gpu/gpu_dx12/gpu_dx12_core.c index befb180b..2c02239a 100644 --- a/src/gpu/gpu_dx12/gpu_dx12_core.c +++ b/src/gpu/gpu_dx12/gpu_dx12_core.c @@ -56,7 +56,8 @@ void G_Bootstrap(void) } if (G_D12.ags_enabled) { - LogInfoF("AMD GPU Service enabled, disabling D3D12 independent devices "); + // NOTE: Device must be created via AGS API + LogInfoF("AMD GPU Service enabled, disabling D3D12 independent devices"); G_D12.independent_devices_enabled = 0; } } @@ -1431,7 +1432,7 @@ G_BaseDescriptorIndex G_PushMemory(G_CommandListHandle cl_handle, G_ArenaHandle ZeroStruct(release); SllQueuePush(cl->releases.first, cl->releases.last, release); release->d3d_resource = resource->d3d_resource; - release->gpu_descriptor = resource->gpu_descriptor; + release->descriptor = resource->gpu_descriptor; } ZeroStruct(resource); } @@ -4209,9 +4210,9 @@ void G_D12_TickAsync(WaveLaneCtx *lane, AsyncFrameLaneCtx *base_async_lane_frame if (completions.v[release->completion_queue_kind] >= release->completion_queue_target) { SllQueuePop(async->pending_releases.first, async->pending_releases.last); - if (release->gpu_descriptor) + if (release->descriptor) { - G_D12_ReleaseDescriptor(release->gpu_descriptor); + G_D12_ReleaseDescriptor(release->descriptor); } if (release->d3d_resource) { diff --git a/src/gpu/gpu_dx12/gpu_dx12_core.h b/src/gpu/gpu_dx12/gpu_dx12_core.h index 29c8278e..31fc4597 100644 --- a/src/gpu/gpu_dx12/gpu_dx12_core.h +++ b/src/gpu/gpu_dx12/gpu_dx12_core.h @@ -284,7 +284,7 @@ Struct(G_D12_Releasable) i64 completion_queue_target; ID3D12Resource *d3d_resource; - G_D12_Descriptor *gpu_descriptor; + G_D12_Descriptor *descriptor; }; Struct(G_D12_ReleasableList) diff --git a/src/pp/pp_vis/pp_vis_core.h b/src/pp/pp_vis/pp_vis_core.h index c0e08265..f382ad05 100644 --- a/src/pp/pp_vis/pp_vis_core.h +++ b/src/pp/pp_vis/pp_vis_core.h @@ -227,6 +227,7 @@ Struct(V_Frame) Arena *dverts_arena; Arena *dvert_idxs_arena; + // Shared w/ GPU Embed(V_SharedFrame, shared_frame); P_World *local_world;