birth-software/bloat-buster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 4-channel pixel for font texture atlas

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-11-30 18:53:57 -06:00 committed by David
parent 2d349436da
commit fc9506f520
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/bloat-buster/bb_core.c
View File

@ -166,7 +166,7 @@ strlit("/usr/share/fonts/TTF/FiraSans-Regular.ttf")
.width = texture_atlas.width, .width = texture_atlas.width,
.height = texture_atlas.height, .height = texture_atlas.height,
.depth = 1, .depth = 1,
.format = R8_UNORM, .format = R8G8B8A8_SRGB,
}); });
DescriptorSetUpdate descriptor_set_updates[] = { DescriptorSetUpdate descriptor_set_updates[] = {
{ {

2
bootstrap/bloat-buster/main.c
View File

@ -24781,7 +24781,7 @@ void entry_point(int argc, char* argv[], char* envp[])
unit_tests(); unit_tests();
#endif #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 #if BB_CI
{ {

2
bootstrap/include/std/font_provider.h
View File

@ -15,7 +15,7 @@ STRUCT(FontCharacter)
STRUCT(TextureAtlas) STRUCT(TextureAtlas)
{ {
u8* pointer; u32* pointer;
FontCharacter* characters; FontCharacter* characters;
s32* kerning_tables; s32* kerning_tables;
u32 width; u32 width;

2
bootstrap/include/std/render.h
View File

@ -24,7 +24,7 @@ typedef enum TextureFormat : u8
STRUCT(TextureMemory) STRUCT(TextureMemory)
{ {
u8* pointer; void* pointer;
u32 width; u32 width;
u32 height; u32 height;
u32 depth; u32 depth;

3
bootstrap/shaders/font.frag
View File

@ -11,7 +11,6 @@ layout(set = 0, binding = 0) uniform sampler2D atlas_texture;
void main() void main()
{ {
vec4 alpha_v = texture(atlas_texture, in_uv); vec4 sampled = texture(atlas_texture, in_uv);
vec4 sampled = vec4(1.0, 1.0, 1.0, alpha_v.r);
out_frag_color = in_color * sampled; out_frag_color = in_color * sampled;
} }

5
bootstrap/std/font_provider.c
View File

@ -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.kerning_tables = arena_allocate(arena, s32, character_count * character_count);
result.height = (u32)sqrtf((f32)(create.text_height * create.text_height * character_count)); result.height = (u32)sqrtf((f32)(create.text_height * create.text_height * character_count));
result.width = result.height; result.width = result.height;
auto atlas_size = result.width * result.height; result.pointer = arena_allocate(arena, u32, result.width * result.height);
result.pointer = arena_allocate(arena, u8, atlas_size);
auto scale_factor = stbtt_ScaleForPixelHeight(&font_info, create.text_height); auto scale_factor = stbtt_ScaleForPixelHeight(&font_info, create.text_height);
int ascent; int ascent;
@ -88,7 +87,7 @@ TextureAtlas font_create_texture_atlas(Arena* arena, TextureAtlasCreate create)
{ {
auto source_index = bitmap_y * width + bitmap_x; auto source_index = bitmap_y * width + bitmap_x;
auto destination_index = ((height - bitmap_y - 1) + y) * result.width + bitmap_x + 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;
} }
} }