From e54178aea909d0b86095d8b4018324defcb84189 Mon Sep 17 00:00:00 2001 From: jacob Date: Tue, 23 Sep 2025 14:02:51 -0500 Subject: [PATCH] formatting --- src/gpu/gpu.h | 5 +++-- src/gpu/gpu_dx12/gpu_dx12.c | 7 ++++++- src/pp/pp.c | 31 +++++++++---------------------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/gpu/gpu.h b/src/gpu/gpu.h index b21396b1..852bfe81 100644 --- a/src/gpu/gpu.h +++ b/src/gpu/gpu.h @@ -217,7 +217,7 @@ Enum(GPU_AddressMode) { GPU_AddressMode_Wrap = 1, GPU_AddressMode_Mirror = 2, - GPU_AddressMode_Clamp = 3, + GPU_AddressMode_Clamp = 3, /* Default */ GPU_AddressMode_Border = 4, GPU_AddressMode_MirrorOnce = 5 }; @@ -354,7 +354,8 @@ Struct(GPU_Scissor) Struct(GPU_MemoryInfo) { - i32 _; + u64 local_used; + u64 non_local_used; }; //////////////////////////////// diff --git a/src/gpu/gpu_dx12/gpu_dx12.c b/src/gpu/gpu_dx12/gpu_dx12.c index 6beab128..8d65be86 100644 --- a/src/gpu/gpu_dx12/gpu_dx12.c +++ b/src/gpu/gpu_dx12/gpu_dx12.c @@ -1092,7 +1092,7 @@ GPU_Resource *GPU_AcquireResource(GPU_ResourceDesc desc) d3d_desc.AddressV = (D3D12_TEXTURE_ADDRESS_MODE)desc.sampler.y; d3d_desc.AddressW = (D3D12_TEXTURE_ADDRESS_MODE)desc.sampler.z; d3d_desc.MipLODBias = desc.sampler.mip_lod_bias; - d3d_desc.MaxAnisotropy = desc.sampler.max_anisotropy; + d3d_desc.MaxAnisotropy = MaxU32(desc.sampler.max_anisotropy, 1); d3d_desc.ComparisonFunc = (D3D12_COMPARISON_FUNC)desc.sampler.comparison; d3d_desc.BorderColor[0] = desc.sampler.border_color.x; d3d_desc.BorderColor[1] = desc.sampler.border_color.y; @@ -1100,6 +1100,11 @@ GPU_Resource *GPU_AcquireResource(GPU_ResourceDesc desc) d3d_desc.BorderColor[3] = desc.sampler.border_color.w; d3d_desc.MinLOD = desc.sampler.min_lod; d3d_desc.MaxLOD = desc.sampler.max_lod; + + /* Defaults */ + if (d3d_desc.AddressU == 0) d3d_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;; + if (d3d_desc.AddressV == 0) d3d_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;; + if (d3d_desc.AddressW == 0) d3d_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP;; if (d3d_desc.MaxLOD >= F32Infinity) { d3d_desc.MaxLOD = D3D12_FLOAT32_MAX; diff --git a/src/pp/pp.c b/src/pp/pp.c index 637c9395..3c66d166 100644 --- a/src/pp/pp.c +++ b/src/pp/pp.c @@ -26,19 +26,8 @@ void StartupUser(void) g->user_blended_client = AcquireClient(g->user_client_store); g->ss_blended = NilSnapshot(); - /* Sampler */ - { - GPU_ResourceDesc desc = ZI; - desc.kind = GPU_ResourceKind_Sampler; - desc.sampler.filter = GPU_Filter_MinMagMipPoint; - desc.sampler.x = GPU_AddressMode_Clamp; - desc.sampler.y = GPU_AddressMode_Clamp; - desc.sampler.z = GPU_AddressMode_Clamp; - desc.sampler.max_anisotropy = 1; - desc.sampler.comparison = GPU_ComparisonFunc_Always; - desc.sampler.max_lod = F32Infinity; - g->pt_sampler = GPU_AcquireResource(desc); - } + /* Create sampler */ + g->pt_sampler = GPU_AcquireResource((GPU_ResourceDesc) { .kind = GPU_ResourceKind_Sampler, .sampler.filter = GPU_Filter_MinMagMipPoint }); /* Renderer data arenas */ g->material_instances_arena = AcquireArena(Gibi(64)); @@ -328,7 +317,7 @@ void DrawDebugConsole(i32 level, b32 minimized) g->console_logs_height = 0; i64 now_ns = TimeNs(); - F_Font *font = F_LoadFontAsync(Lit("font/fixedsys.ttf"), 12.0f); + F_Font *font = F_LoadFontAsync(ResourceFromStore(&GameResources, Lit("font/fixedsys.ttf")), 12.0f); if (font) { Lock lock = LockE(&g->console_logs_mutex); @@ -1507,7 +1496,7 @@ void UpdateUser(P_Window *window) #if 0 /* Draw contact info */ { - F_Font *disp_font = F_LoadFontAsync(Lit("font/fixedsys.ttf"), 12.0f); + F_Font *disp_font = F_LoadFontAsync(ResourceFromStore(&GameResources, Lit("font/fixedsys.ttf")), 12.0f); if (disp_font) { f32 offset_px = 10; @@ -1629,7 +1618,7 @@ void UpdateUser(P_Window *window) #if 0 /* Test info */ { - F_Font *disp_font = F_LoadFontAsync(Lit("font/fixedsys.ttf"), 12.0f); + F_Font *disp_font = F_LoadFontAsync(ResourceFromStore(&GameResources, Lit("font/fixedsys.ttf")), 12.0f); if (disp_font) { f32 offset_px = 10; @@ -2016,7 +2005,7 @@ void UpdateUser(P_Window *window) Entity *ent = hovered_ent; Vec2 pos = AddVec2(g->ui_cursor, VEC2(15, 15)); - F_Font *font = F_LoadFontAsync(Lit("font/fixedsys.ttf"), 12.0f); + F_Font *font = F_LoadFontAsync(ResourceFromStore(&GameResources, Lit("font/fixedsys.ttf")), 12.0f); if (font) { TempArena temp = BeginTempArena(scratch.arena); @@ -2038,11 +2027,10 @@ void UpdateUser(P_Window *window) //- Draw global debug info /* FIXME: Enable this */ -#if 0 if (g->debug_draw) { __profn("Draw debug info"); - F_Font *font = F_LoadFontAsync(Lit("font/fixedsys.ttf"), 12.0f); + F_Font *font = F_LoadFontAsync(ResourceFromStore(&GameResources, Lit("font/fixedsys.ttf")), 12.0f); if (font) { TempArena temp = BeginTempArena(scratch.arena); @@ -2143,15 +2131,14 @@ void UpdateUser(P_Window *window) //draw_text(g->render_sig, font, pos, StringF(temp.arena, "blended world entities: %F/%F", FmtUint(g->ss_blended->num_ents_allocated), FmtUint(g->ss_blended->num_ents_reserved))); //draw_text(g->render_sig, font, pos, text); +#if 0 Vec2 pos = VEC2(10, g->ui_size.y); D_TextOffsetY offset_y = DRAW_TEXT_OFFSET_Y_BOTTOM; draw_text(g->render_sig, D_TEXTPARAMS(.font = font, .pos = pos, .str = text, .offset_y = offset_y, .color = ColorWhite)); +#endif EndTempArena(temp); } } -#else - LAX vram; -#endif { #if DeveloperIsEnabled