From fc9506f5200b2173b7d5e5410cebb46d0a5d2bb6 Mon Sep 17 00:00:00 2001
From: David Gonzalez Martin <davidgm94.work@protonmail.com>
Date: Sat, 30 Nov 2024 18:53:57 -0600
Subject: [PATCH] Use 4-channel pixel for font texture atlas

---
 bootstrap/bloat-buster/bb_core.c      | 2 +-
 bootstrap/bloat-buster/main.c         | 2 +-
 bootstrap/include/std/font_provider.h | 2 +-
 bootstrap/include/std/render.h        | 2 +-
 bootstrap/shaders/font.frag           | 3 +--
 bootstrap/std/font_provider.c         | 5 ++---
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bootstrap/bloat-buster/bb_core.c b/bootstrap/bloat-buster/bb_core.c
index 4af9de4..91816dc 100644
--- a/bootstrap/bloat-buster/bb_core.c
+++ b/bootstrap/bloat-buster/bb_core.c
@@ -166,7 +166,7 @@ strlit("/usr/share/fonts/TTF/FiraSans-Regular.ttf")
         .width = texture_atlas.width,
         .height = texture_atlas.height,
         .depth = 1,
-        .format = R8_UNORM,
+        .format = R8G8B8A8_SRGB,
     });
     DescriptorSetUpdate descriptor_set_updates[] = {
         {
diff --git a/bootstrap/bloat-buster/main.c b/bootstrap/bloat-buster/main.c
index 7e2da13..9c95adc 100644
--- a/bootstrap/bloat-buster/main.c
+++ b/bootstrap/bloat-buster/main.c
@@ -24781,7 +24781,7 @@ void entry_point(int argc, char* argv[], char* envp[])
     unit_tests();
 #endif
 
-    Arena* global_arena = arena_init(MB(2), KB(64), KB(64));
+    Arena* global_arena = arena_init(MB(16), KB(64), KB(64));
 #if BB_CI
 
     {
diff --git a/bootstrap/include/std/font_provider.h b/bootstrap/include/std/font_provider.h
index b45ea9a..7786eba 100644
--- a/bootstrap/include/std/font_provider.h
+++ b/bootstrap/include/std/font_provider.h
@@ -15,7 +15,7 @@ STRUCT(FontCharacter)
 
 STRUCT(TextureAtlas)
 {
-    u8* pointer;
+    u32* pointer;
     FontCharacter* characters;
     s32* kerning_tables;
     u32 width;
diff --git a/bootstrap/include/std/render.h b/bootstrap/include/std/render.h
index 2e51525..d19520a 100644
--- a/bootstrap/include/std/render.h
+++ b/bootstrap/include/std/render.h
@@ -24,7 +24,7 @@ typedef enum TextureFormat : u8
 
 STRUCT(TextureMemory)
 {
-    u8* pointer;
+    void* pointer;
     u32 width;
     u32 height;
     u32 depth;
diff --git a/bootstrap/shaders/font.frag b/bootstrap/shaders/font.frag
index 4add626..e7a0a0a 100644
--- a/bootstrap/shaders/font.frag
+++ b/bootstrap/shaders/font.frag
@@ -11,7 +11,6 @@ layout(set = 0, binding = 0) uniform sampler2D atlas_texture;
 
 void main() 
 {
-    vec4 alpha_v = texture(atlas_texture, in_uv);
-    vec4 sampled = vec4(1.0, 1.0, 1.0, alpha_v.r);
+    vec4 sampled = texture(atlas_texture, in_uv);
     out_frag_color = in_color * sampled;
 }
diff --git a/bootstrap/std/font_provider.c b/bootstrap/std/font_provider.c
index 72d283c..d50cef4 100644
--- a/bootstrap/std/font_provider.c
+++ b/bootstrap/std/font_provider.c
@@ -22,8 +22,7 @@ TextureAtlas font_create_texture_atlas(Arena* arena, TextureAtlasCreate create)
     result.kerning_tables = arena_allocate(arena, s32, character_count * character_count);
     result.height = (u32)sqrtf((f32)(create.text_height * create.text_height * character_count));
     result.width = result.height;
-    auto atlas_size = result.width * result.height;
-    result.pointer = arena_allocate(arena, u8, atlas_size);
+    result.pointer = arena_allocate(arena, u32, result.width * result.height);
     auto scale_factor = stbtt_ScaleForPixelHeight(&font_info, create.text_height);
 
     int ascent;
@@ -88,7 +87,7 @@ TextureAtlas font_create_texture_atlas(Arena* arena, TextureAtlasCreate create)
             {
                 auto source_index = bitmap_y * width + bitmap_x;
                 auto destination_index = ((height - bitmap_y - 1) + y) * result.width + bitmap_x + x;
-                destination[destination_index] = source[source_index];
+                destination[destination_index] = ((u32)(source[source_index]) << 24) | 0xffffff;
             }
         }