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

formatting

Browse Source
This commit is contained in:
jacob 2026-02-26 14:25:18 -06:00
parent 83cecf39f0
commit aaad2cb838
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.bat
View File

@ -14,8 +14,6 @@ if "%--force_meta_build%"=="1" (
if exist meta.exe del meta.exe if exist meta.exe del meta.exe
) )
echo build_cmd: %program_build_cmd%
::- Try to activate Visual Studio if devenv not detected ::- Try to activate Visual Studio if devenv not detected
:: Taken from wcap: https://github.com/mmozeiko/wcap/blob/aa25ccb806d7a6e1c0bfdcca863aabcd8e9badfa/build.cmd#L21-L29 :: Taken from wcap: https://github.com/mmozeiko/wcap/blob/aa25ccb806d7a6e1c0bfdcca863aabcd8e9badfa/build.cmd#L21-L29
if "%PROCESSOR_ARCHITECTURE%" equ "AMD64" ( if "%PROCESSOR_ARCHITECTURE%" equ "AMD64" (
@ -43,10 +41,10 @@ where /Q cl.exe || (
echo. echo.
) )
::- Meta build ::- Build metaprogram
:meta_build :meta_build
if not exist meta.exe ( if not exist meta.exe (
echo ====== Meta build ===== echo ====== Meta Build =====
%meta_build_cmd% %meta_build_cmd%
set "rc=!errorlevel!" set "rc=!errorlevel!"
if !rc! NEQ 0 ( if !rc! NEQ 0 (
@ -55,8 +53,8 @@ if not exist meta.exe (
) )
) )
::- Program build ::- Run metaprogram
if not "%--no_program_build%"=="1" ( if not "%--no_meta_run%"=="1" (
echo ======== Build ======== echo ======== Build ========
%program_build_cmd% %program_build_cmd%
set "rc=!errorlevel!" set "rc=!errorlevel!"

32
src/gpu/gpu_dx12/gpu_dx12_core.c
View File

@ -399,6 +399,7 @@ void G_Bootstrap(void)
G_D12_Arena *gpu_perm = G_D12_ArenaFromHandle(G_PermArena()); G_D12_Arena *gpu_perm = G_D12_ArenaFromHandle(G_PermArena());
G_D12_Descriptor *nil_descriptor = G_D12_PushDescriptor(gpu_perm, kind); G_D12_Descriptor *nil_descriptor = G_D12_PushDescriptor(gpu_perm, kind);
Assert(nil_descriptor->index == 0); Assert(nil_descriptor->index == 0);
G_D12_SetObjectName((ID3D12Object *)heap->d3d_heap, desc.name);
} }
if (FAILED(hr)) if (FAILED(hr))
@ -780,22 +781,29 @@ G_D12_Pipeline *G_D12_PipelineFromDesc(G_D12_PipelineDesc desc)
String pipeline_name = Zi; String pipeline_name = Zi;
if (is_compute) if (is_compute)
{ {
pipeline_name = StringF( pipeline_name = NameFromResource(desc.cs.resource);
scratch.arena, if (pipeline_name.len == 0)
"%F %F", {
FmtString(NameFromResource(desc.cs.resource)), pipeline_name = StringF(scratch.arena, "%F", FmtHandle(desc.cs.resource.v));
FmtHandle(desc.cs.resource.v) }
);
} }
else else
{ {
String vs_name = NameFromResource(desc.vs.resource);
String ps_name = NameFromResource(desc.ps.resource);
if (vs_name.len == 0)
{
vs_name = StringF(scratch.arena, "%F", FmtHandle(desc.vs.resource.v));
}
if (ps_name.len == 0)
{
ps_name = StringF(scratch.arena, "%F", FmtHandle(desc.ps.resource.v));
}
pipeline_name = StringF( pipeline_name = StringF(
scratch.arena, scratch.arena,
"%F %F - %F %F", "%F - %F",
FmtString(NameFromResource(desc.vs.resource)), FmtString(vs_name),
FmtHandle(desc.vs.resource.v), FmtString(ps_name)
FmtString(NameFromResource(desc.ps.resource)),
FmtHandle(desc.ps.resource.v)
); );
} }
@ -1530,7 +1538,7 @@ G_ResourceHandle G_PushResource(G_ArenaHandle arena_handle, G_CommandListHandle
{ {
resource->name_len = new_name.len; resource->name_len = new_name.len;
CopyBytes(resource->name_text, new_name.text, new_name.len); CopyBytes(resource->name_text, new_name.text, new_name.len);
if (GPU_NAMES) if (GPU_NAMES && resource->d3d_resource)
{ {
G_D12_SetObjectName((ID3D12Object *)resource->d3d_resource, new_name); G_D12_SetObjectName((ID3D12Object *)resource->d3d_resource, new_name);
} }