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

Implement primitive caching and layout algorithm

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-12-17 21:34:09 -06:00 committed by David
parent 0a74af7ef6
commit b3427d0fcf
22 changed files with 1047 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -234,7 +234,7 @@ if (NOT BB_IS_CI)
"bootstrap/std/shader_compilation.c"
"bootstrap/std/font_cache.c"
"bootstrap/std/font_provider.c"
"bootstrap/std/graphics.c"
"bootstrap/std/window.c"
"bootstrap/std/render.c"
"bootstrap/std/ui_core.c"
"bootstrap/std/ui_builder.c"

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

@ -2,7 +2,7 @@
#include <bloat-buster/bb_core.h>
#include <std/virtual_buffer.h>
#include <std/graphics.h>
#include <std/window.h>
#include <std/render.h>
#include <std/shader_compilation.h>
#include <std/image_loader.h>
@ -84,22 +84,12 @@ fn void app_update()
if (likely(ui_build_begin(window->os, frame_ms, &state.event_queue)))
{
{
if (unlikely(ui_button(strlit("Hello world\n"), (UI_Rect) {
.x0 = 200,
.y0 = 200,
.x1 = 300,
.y1 = 300,
}).clicked_left))
if (unlikely(ui_button(strlit("Hello world\n")).clicked_left))
{
print("Clicked on hello world\n");
}
if (unlikely(ui_button(strlit("Bye world\n"), (UI_Rect) {
.x0 = 600,
.y0 = 500,
.x1 = 700,
.y1 = 600,
}).clicked_left))
if (unlikely(ui_button(strlit("Bye world\n")).clicked_left))
{
print("Clicked on bye world\n");
}
@ -170,10 +160,7 @@ void run_app()
}
state.first_window->render = renderer_window_initialize(state.renderer, state.first_window->os);
state.first_window->ui = arena_allocate(state.arena, UI_State, 1);
state.first_window->ui->arena = arena_init(GB(4), MB(2), MB(2));
state.first_window->ui->render = state.first_window->render;
state.first_window->ui->renderer = state.renderer;
state.first_window->ui = ui_state_allocate(state.renderer, state.first_window->render);
state.first_window->root_panel = arena_allocate(state.arena, BBPanel, 1);
state.first_window->root_panel->parent_percentage = 1.0f;
state.first_window->root_panel->split_axis = AXIS2_X;
@ -194,7 +181,7 @@ strlit("/Users/david/Library/Fonts/FiraSans-Regular.ttf");
auto white_texture = white_texture_create(state.arena, state.renderer);
auto monospace_font = font_texture_atlas_create(state.arena, state.renderer, (TextureAtlasCreate) {
.font_path = font_path,
.text_height = 50,
.text_height = 12,
});
auto proportional_font = monospace_font;

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

@ -2400,7 +2400,7 @@ fn UseReference thread_get_node_reference_array(Thread* thread, u16 count)
{
if (thread->buffer.use_free_list.pointer[i].length >= count)
{
trap();
todo();
}
}
@ -2604,7 +2604,7 @@ fn u8 node_remove_output(Thread* thread, NodeIndex node_index, NodeIndex use_ind
// for (u32 i = 0; i < node->dependency_count; i += 1)
// {
// unused(thread);
// trap();
// todo();
// }
// }
@ -2755,7 +2755,7 @@ fn NodeIndex thread_node_add(Thread* thread, NodeCreate data)
// {
// if (node_remove_output(thread, old_input, node_index))
// {
// trap();
// todo();
// }
// }
// }
@ -2837,7 +2837,7 @@ fn NodeIndex thread_node_add(Thread* thread, NodeCreate data)
//
// // if (old_node->id == NODE_SCOPE)
// // {
// // trap();
// // todo();
// // }
//
// if (validi(node_index))
@ -2910,7 +2910,7 @@ fn NodeIndex thread_node_add(Thread* thread, NodeCreate data)
// }
// } break;
// default:
// trap();
// todo();
// }
// }
// }
@ -2986,15 +2986,15 @@ fn Hash64 node_get_hash_default(Thread* thread, Node* node, NodeIndex node_index
// auto* right = thread_node_get(thread, right_node_index);
// if (index_equal(left_node_index, right_node_index))
// {
// trap();
// todo();
// }
// else if (right->id == IR_INTEGER_NEGATION)
// {
// trap();
// todo();
// }
// else if (left->id == IR_INTEGER_NEGATION)
// {
// trap();
// todo();
// }
// else
// {
@ -3012,7 +3012,7 @@ fn Hash64 node_get_hash_default(Thread* thread, Node* node, NodeIndex node_index
// auto* right = thread_node_get(thread, right_node_index);
// if (index_equal(left_node_index, right_node_index))
// {
// trap();
// todo();
// }
//
// if (node->id == IR_INTEGER_COMPARE_EQUAL)
@ -3337,7 +3337,7 @@ fn u8 node_equal(Thread* thread, NodeIndex a_index, NodeIndex b_index)
// // result = a->start.function == b->start.function;
// break;
// default:
// trap();
// todo();
// }
}
}
@ -3722,7 +3722,7 @@ fn Hash64 type_get_hash_tuple(Thread* thread, Type* type)
// {
// auto type_index = *(TypeIndex*)&key;
// unused(type_index);
// trap();
// todo();
// } break;
// case INTERN_POOL_KIND_NODE:
// {
@ -3762,7 +3762,7 @@ fn Hash64 type_get_hash_tuple(Thread* thread, Type* type)
// case IR_PROJECTION:
// return node->projection.index;
// default:
// trap();
// todo();
// }
// }
@ -3799,17 +3799,17 @@ fn Hash64 type_get_hash_tuple(Thread* thread, Type* type)
// {
// if (index_equal(control_type->tuple.types.pointer[index], thread->types.dead_control))
// {
// trap();
// todo();
// }
// if (control_node->id == IR_IF)
// {
// trap();
// todo();
// }
// }
//
// if (control_node->id == IR_IF)
// {
// trap();
// todo();
// }
//
// return invalidi(Node);
@ -4015,7 +4015,7 @@ fn NodeIndex return_get_value(Thread* thread, Node* node)
// {
// auto type_index = *(TypeIndex*)&key;
// unused(type_index);
// trap();
// todo();
// } break;
// case INTERN_POOL_KIND_NODE:
// {
@ -4095,7 +4095,7 @@ fn NodeIndex return_get_value(Thread* thread, Node* node)
// auto existing_type_index = *(DebugTypeIndex*)&key;
// DebugType* existing_type = thread_debug_type_get(thread, existing_type_index);
// auto existing_hash = hash_debug_type(existing_type);
// trap();
// todo();
// // if (type_equal(existing_type, type))
// // {
// // result = index;
@ -4165,7 +4165,7 @@ fn NodeIndex return_get_value(Thread* thread, Node* node)
// {
// if (thread->interned.types.length < existing_capacity)
// {
// trap();
// todo();
// }
// else if (thread->interned.types.length == existing_capacity)
// {
@ -4177,7 +4177,7 @@ fn NodeIndex return_get_value(Thread* thread, Node* node)
// }
// else
// {
// trap();
// todo();
// }
// }
// }
@ -4208,7 +4208,7 @@ fn NodeIndex return_get_value(Thread* thread, Node* node)
// {
// if (thread->interned.types.length < existing_capacity)
// {
// trap();
// todo();
// }
// else if (thread->interned.types.length == existing_capacity)
// {
@ -4220,7 +4220,7 @@ fn NodeIndex return_get_value(Thread* thread, Node* node)
// }
// else
// {
// trap();
// todo();
// }
// }
// }
@ -4309,7 +4309,7 @@ fn NodeIndex idealize_return(Thread* thread, NodeIndex node_index)
// auto* input_node = thread_node_get(thread, input_node_index);
// if (index_equal(input_node->type, thread->types.dead_control))
// {
// trap();
// todo();
// }
// }
//
@ -4374,7 +4374,7 @@ fn NodeIndex idealize_return(Thread* thread, NodeIndex node_index)
// }
// else if (type_is_simple(b_type))
// {
// trap();
// todo();
// }
// else
// {
@ -4428,7 +4428,7 @@ fn NodeIndex idealize_return(Thread* thread, NodeIndex node_index)
// }
// else if ((left_type->integer.is_constant & !left_type->integer.bit_count) & (!right_type->integer.is_constant & !!right_type->integer.bit_count))
// {
// trap();
// todo();
// }
// }
// } break;
@ -4457,7 +4457,7 @@ fn NodeIndex idealize_return(Thread* thread, NodeIndex node_index)
// }
// } break;
// default:
// trap();
// todo();
// }
// }
// }
@ -4526,7 +4526,7 @@ fn NodeIndex idealize_return(Thread* thread, NodeIndex node_index)
// result = left_value >> right_value;
// break;
// default:
// trap();
// todo();
// }
//
// type_integer.constant = result;
@ -4739,7 +4739,7 @@ fn Hash64 hash_type(Thread* thread, Type* type)
// {
// if (thread->interned.nodes.length < existing_capacity)
// {
// trap();
// todo();
// }
// else if (thread->interned.nodes.length == existing_capacity)
// {
@ -4751,7 +4751,7 @@ fn Hash64 hash_type(Thread* thread, Type* type)
// }
// else
// {
// trap();
// todo();
// }
// }
// }
@ -4816,7 +4816,7 @@ fn Hash64 hash_type(Thread* thread, Type* type)
// }
// else
// {
// trap();
// todo();
// }
// }
@ -4955,7 +4955,7 @@ STRUCT(Parser)
// {
// unused(thread);
// unused(node_index);
// trap();
// todo();
// }
// fn void thread_add_jobs(Thread* thread, Slice(NodeIndex) nodes)
@ -5041,7 +5041,7 @@ fn NodeIndex dead_code_elimination(Thread* thread, NodePair nodes)
// else
// {
// unused(thread);
// trap();
// todo();
// }
//
// return result;
@ -5084,7 +5084,7 @@ fn NodeIndex peephole_optimize(Thread* thread, Function* function, NodeIndex nod
// {
// if (index_equal(node->type, thread->types.dead_control))
// {
// trap();
// todo();
// }
// else
// {
@ -5211,15 +5211,15 @@ fn TypePair analyze_type(Thread* thread, Parser* parser, String src)
if (void_start)
{
trap();
todo();
}
else if (is_array_start)
{
trap();
todo();
}
else if (pointer_start)
{
trap();
todo();
}
else if (number_start)
{
@ -5295,11 +5295,11 @@ fn TypePair analyze_type(Thread* thread, Parser* parser, String src)
}
else if (float_start)
{
trap();
todo();
}
else
{
trap();
todo();
}
}
else
@ -5308,7 +5308,7 @@ fn TypePair analyze_type(Thread* thread, Parser* parser, String src)
}
}
trap();
todo();
}
declare_ip_functions(Node, node)
@ -5404,7 +5404,7 @@ fn NodeIndex analyze_primary_expression(Thread* thread, Parser* parser, Function
// parser->i += 1;
// }
trap();
todo();
// auto slice = src.slice(start, parser->i);
// value = parse_hex(slice);
} break;
@ -5419,11 +5419,11 @@ fn NodeIndex analyze_primary_expression(Thread* thread, Parser* parser, Function
} break;
case INTEGER_PREFIX_OCTAL:
{
trap();
todo();
} break;
case INTEGER_PREFIX_BINARY:
{
trap();
todo();
} break;
}
@ -5446,7 +5446,7 @@ fn NodeIndex analyze_primary_expression(Thread* thread, Parser* parser, Function
}
else
{
trap();
todo();
}
}
@ -5906,7 +5906,7 @@ fn void analyze_block(Thread* thread, Parser* parser, FunctionBuilder* builder,
parser->i += 1;
break;
default:
trap();
todo();
}
unused(assignment_operator);
@ -6089,7 +6089,7 @@ fn void analyze_file(Thread* thread, File* file)
case argument_end:
break;
default:
trap();
todo();
}
}
@ -6202,12 +6202,12 @@ fn void analyze_file(Thread* thread, File* file)
}
else
{
trap();
todo();
}
}
else
{
trap();
todo();
}
}
}
@ -6315,7 +6315,7 @@ fn void analyze_file(Thread* thread, File* file)
// // auto new_node_index = peephole_optimize(thread, function, node_index);
// // if (validi(new_node_index))
// // {
// // trap();
// // todo();
// // }
// // }
// }
@ -6339,7 +6339,7 @@ fn void analyze_file(Thread* thread, File* file)
// case IR_PROJECTION:
// return 0;
// default:
// trap();
// todo();
// }
// }
@ -6417,7 +6417,7 @@ fn void analyze_file(Thread* thread, File* file)
// }
// } break;
// default:
// trap();
// todo();
// }
//
// return loop_depth;
@ -6441,7 +6441,7 @@ fn void analyze_file(Thread* thread, File* file)
// case IR_INTEGER_COMPARE_NOT_EQUAL:
// return 0;
// default:
// trap();
// todo();
// }
// }
@ -6461,7 +6461,7 @@ fn void analyze_file(Thread* thread, File* file)
// case IR_STOP:
// todo();
// default:
// trap();
// todo();
// }
// }
@ -6504,7 +6504,7 @@ fn void analyze_file(Thread* thread, File* file)
// if (input_depth > early_depth)
// {
// early = control_input_index;
// trap();
// todo();
// }
// }
//
@ -6521,7 +6521,7 @@ fn void analyze_file(Thread* thread, File* file)
// case IR_START:
// return 1;
// default:
// trap();
// todo();
// }
// }
//
@ -6540,7 +6540,7 @@ fn void analyze_file(Thread* thread, File* file)
//
// if (result)
// {
// trap();
// todo();
// }
// }
// }
@ -6561,7 +6561,7 @@ fn void analyze_file(Thread* thread, File* file)
//
// if (node->id == IR_PHI)
// {
// trap();
// todo();
// }
//
// auto outputs = node_get_outputs(thread, node);
@ -6571,7 +6571,7 @@ fn void analyze_file(Thread* thread, File* file)
// NodeIndex output = outputs.pointer[i];
// if (is_forwards_edge(thread, output, node_index))
// {
// trap();
// todo();
// }
// }
//
@ -6580,14 +6580,14 @@ fn void analyze_file(Thread* thread, File* file)
// NodeIndex output = outputs.pointer[i];
// if (is_forwards_edge(thread, output, node_index))
// {
// trap();
// todo();
// }
// }
//
// if (!node_is_pinned(node))
// {
// unused(nodes);
// trap();
// todo();
// }
// }
// }
@ -6619,7 +6619,7 @@ fn void analyze_file(Thread* thread, File* file)
//
// if (node_is_region(node))
// {
// trap();
// todo();
// }
// }
//
@ -6643,7 +6643,7 @@ fn void analyze_file(Thread* thread, File* file)
// auto node_index = nodes.pointer[i];
// if (validi(node_index))
// {
// trap();
// todo();
// auto late_node_index = late.pointer[i];
// node_set_input(thread, node_index, 0, late_node_index);
// }
@ -6762,7 +6762,7 @@ fn void analyze_file(Thread* thread, File* file)
// c_lower_append_ch(backend, lower_digit + '0');
// } break;
// default:
// trap();
// todo();
// }
// }
@ -6791,9 +6791,9 @@ fn void analyze_file(Thread* thread, File* file)
// // auto written_characters = format_hexadecimal(buffer_slice, type->integer.constant);
// // backend->buffer.length = current_length + written_characters;
// // } break;
// // trap();
// // todo();
// // default:
// // trap();
// // todo();
// // }
// // } break;
// // case IR_INTEGER_SUBSTRACT:
@ -6843,18 +6843,18 @@ fn void analyze_file(Thread* thread, File* file)
// // // break;
// // // // return interpreter->arguments.length;
// // // case 2:
// // // trap();
// // // todo();
// // // default:
// // // trap();
// // // todo();
// // // }
// // // }
// // // else
// // // {
// // // trap();
// // // todo();
// // // }
// // // } break;
// // default:
// // trap();
// // todo();
// // }
// todo();
// }

93
bootstrap/include/std/base.h
View File

@ -15,9 +15,11 @@
#include <stdint.h>
#include <stdarg.h>
#include <stddef.h>
#include <stdlib.h>
#if defined(__x86_64__)
#include <immintrin.h>
#endif
#include <math.h>
typedef uint8_t u8;
typedef uint16_t u16;
@ -33,6 +35,7 @@ typedef __int128_t s128;
typedef size_t usize;
typedef _Float16 f16;
typedef float f32;
typedef double f64;
@ -44,7 +47,16 @@ typedef u64 Hash64;
#define UNION_FORWARD_DECL(U) typedef union U U
#define UNION(U) UNION_FORWARD_DECL(U); union U
STRUCT(UVec2)
typedef enum Corner
{
CORNER_00,
CORNER_01,
CORNER_10,
CORNER_11,
CORNER_COUNT,
} Corner;
STRUCT(U32Vec2)
{
struct
{
@ -54,12 +66,43 @@ STRUCT(UVec2)
u32 v[2];
};
STRUCT(Vec4)
STRUCT(F32Vec4)
{
f32 v[4];
}__attribute__((aligned(16)));
typedef Vec4 Color;
};
typedef F32Vec4 Color;
UNION(F32Vec2)
{
struct
{
f32 x;
f32 y;
};
f32 v[2];
};
UNION(F32Interval2)
{
struct
{
F32Vec2 min;
F32Vec2 max;
};
struct
{
F32Vec2 p0;
F32Vec2 p1;
};
struct
{
f32 x0;
f32 y0;
f32 x1;
f32 y1;
};
F32Vec2 v[2];
};
typedef enum Axis2
{
@ -132,9 +175,15 @@ FOR_N(_i, 0, ((set)->arr.capacity + 63) / 64) FOR_BIT(it, _i*64, (set)->arr.poin
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#define CLAMP(a, x, b) (((a)>(x))?(a):((b)<(x))?(b):(x))
#ifndef INFINITY
#define INFINITY __builtin_inff()
#endif
#ifndef NAN
#define NAN __builtin_nanf("")
#endif
#define fn static
#define method __attribute__((visibility("internal")))
#define global_variable static
@ -142,11 +191,9 @@ FOR_N(_i, 0, ((set)->arr.capacity + 63) / 64) FOR_BIT(it, _i*64, (set)->arr.poin
#define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0)
#define breakpoint() __builtin_debugtrap()
#define failed_execution() trap()
#define failed_execution() my_panic("Failed execution at {cstr}:{u32}\n", __FILE__, __LINE__)
EXPORT void print(const char* format, ...);
#define trap() bad_exit("Trap reached", __FILE__, __LINE__)
#define trap() __builtin_trap()
#define array_length(arr) sizeof(arr) / sizeof((arr)[0])
#define KB(n) ((n) * 1024)
#define MB(n) ((n) * 1024 * 1024)
@ -156,7 +203,6 @@ EXPORT void print(const char* format, ...);
#define may_be_unused __attribute__((unused))
#define truncate_value(Destination, source) (Destination)(source)
#define cast_to(Destination, Source, source) cast_ ## Source ## _to_ ## Destination (source, __FILE__, __LINE__)
#define bad_exit(message, file, line) do { print(message " at {cstr}:{u32}\n", file, line); __builtin_trap(); } while(0)
#define size_until_end(T, field_name) (sizeof(T) - offsetof(T, field_name))
#define SWAP(a, b) \
do {\
@ -194,7 +240,7 @@ const may_be_unused global_variable u8 bracket_close = ']';
#define s_equal(a, b) ((a).length == (b).length && memcmp((a).pointer, (b).pointer, sizeof(*((a).pointer)) * (a).length) == 0)
#if BB_DEBUG
#define assert(x) if (unlikely(!(x))) { bad_exit("Assert failed: \"" # x "\"", __FILE__, __LINE__); }
#define assert(x) if (unlikely(!(x))) { my_panic("Assert failed: \"" # x "\" at {cstr}:{u32}\n", __FILE__, __LINE__); }
#else
#define assert(x) unlikely(!(x))
#endif
@ -205,7 +251,7 @@ const may_be_unused global_variable u8 bracket_close = ']';
#undef unreachable
#endif
#if BB_DEBUG
#define unreachable() bad_exit("Unreachable triggered", __FILE__, __LINE__)
#define unreachable() my_panic("Unreachable triggered\n", __FILE__, __LINE__)
#else
#define unreachable() __builtin_unreachable()
#endif
@ -217,7 +263,7 @@ const may_be_unused global_variable u8 bracket_close = ']';
#define restrict __restrict
#endif
#define todo() do { print("TODO at {cstr}:{u32}\n", __FILE__, __LINE__); __builtin_trap(); } while(0)
#define todo() my_panic("TODO at {cstr}:{u32}\n", __FILE__, __LINE__)
EXPORT u64 align_forward(u64 value, u64 alignment);
EXPORT u64 align_backward(u64 value, u64 alignment);
@ -282,3 +328,26 @@ STRUCT(TextureIndex)
{
u32 value;
};
EXPORT void print(const char* format, ...);
EXPORT u8 os_is_being_debugged();
fn u64 safe_flag(u64 value, u64 flag)
{
u64 result = value & ((u64)0 - flag);
return result;
}
#define my_panic(...) do \
{\
print(__VA_ARGS__);\
if (os_is_being_debugged())\
{\
trap();\
}\
else\
{\
exit(1);\
}\
} while (0)

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

@ -37,4 +37,4 @@ STRUCT(TextureAtlasCreate)
#include <std/render.h>
EXPORT TextureAtlas font_texture_atlas_create(Arena* arena, Renderer* renderer, TextureAtlasCreate create);
EXPORT UVec2 texture_atlas_compute_string_rect(String string, const TextureAtlas* atlas);
EXPORT U32Vec2 texture_atlas_compute_string_rect(String string, const TextureAtlas* atlas);

6
bootstrap/include/std/os.h
View File

@ -52,8 +52,8 @@ STRUCT(OSReserveMapFlags)
STRUCT(Arena)
{
u64 reserved_size;
u64 committed;
u64 commit_position;
u64 position;
u64 os_position;
u64 granularity;
u8 reserved[4 * 8];
};
@ -87,6 +87,7 @@ EXPORT String path_no_extension(String string);
EXPORT Arena* arena_init(u64 reserved_size, u64 granularity, u64 initial_size);
EXPORT Arena* arena_init_default(u64 initial_size);
EXPORT void arena_clear(Arena* arena);
EXPORT String arena_join_string(Arena* arena, Slice(String) pieces);
EXPORT u8* arena_allocate_bytes(Arena* arena, u64 size, u64 alignment);
EXPORT void arena_reset(Arena* arena);
@ -111,6 +112,7 @@ EXPORT void print_string(String string);
EXPORT Timestamp os_timestamp();
EXPORT f64 os_resolve_timestamps(Timestamp start, Timestamp end, TimeUnit time_unit);
EXPORT u8 os_is_being_debugged();
#if _WIN32
typedef void* HANDLE;

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

@ -5,7 +5,7 @@
typedef struct Renderer Renderer;
#include <std/graphics.h>
#include <std/window.h>
#include <std/font_provider.h>
typedef struct RenderWindow RenderWindow;
@ -33,13 +33,13 @@ STRUCT(RectVertex)
f32 y;
f32 uv_x;
f32 uv_y;
Vec4 color;
F32Vec4 color;
u32 texture_index;
u32 reserved[3];
};
decl_vb(RectVertex);
#define Color4(r, g, b, a) ((Vec4){ .v = { r, g, b, a } })
#define Color4(r, g, b, a) ((F32Vec4){ .v = { r, g, b, a } })
typedef enum BBPipeline
{
@ -182,7 +182,7 @@ EXPORT PipelineLayoutIndex renderer_pipeline_get_layout(PipelineIndex pipeline);
EXPORT void renderer_window_frame_begin(Renderer* renderer, RenderWindow* window);
EXPORT void renderer_window_frame_end(Renderer* renderer, RenderWindow* window);
EXPORT TextureIndex renderer_texture_create(Renderer* renderer, TextureMemory texture_memory);
EXPORT UVec2 renderer_font_compute_string_rect(Renderer* renderer, RenderFontType type, String string);
EXPORT U32Vec2 renderer_font_compute_string_rect(Renderer* renderer, RenderFontType type, String string);
EXPORT void window_command_begin(RenderWindow* window);
EXPORT void window_command_end(RenderWindow* window);
EXPORT void window_render_begin(RenderWindow* window);

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

@ -4,3 +4,5 @@ EXPORT s32 string_first_ch(String string, u8 ch);
EXPORT s64 string_last_ch(String string, u8 ch);
EXPORT u8 string_starts_with(String string, String start);
EXPORT u8 string_ends_with(String string, String end);
EXPORT u64 string_first_ocurrence(String string, String substring);
EXPORT u64 string_last_ocurrence(String string, String substring);

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

@ -3,4 +3,4 @@
#include <std/base.h>
#include <std/ui_core.h>
EXPORT UI_Signal ui_button(String string, UI_Rect rect);
EXPORT UI_Signal ui_button(String string);

148
bootstrap/include/std/ui_core.h
View File

@ -1,57 +1,170 @@
#pragma once
#include <std/base.h>
#include <std/graphics.h>
#include <std/window.h>
#include <std/os.h>
#include <std/render.h>
typedef enum UI_SizeKind : u8
{
UI_SIZE_PIXEL_COUNT,
UI_SIZE_PERCENTAGE,
UI_SIZE_BY_CHILDREN,
UI_SIZE_COUNT,
} UI_SizeKind;
STRUCT(UI_Size)
{
UI_SizeKind kind;
f32 value;
f32 strictness;
};
static_assert(sizeof(UI_Size) == 12);
decl_vb(UI_Size);
STRUCT(UI_Key)
{
u64 value;
};
STRUCT(UI_MousePosition)
{
f64 x;
f64 y;
};
STRUCT(UI_WidgetFlags)
typedef enum UI_WidgetFlagEnum : u64
{
u32 draw_text:1;
u32 draw_background:1;
u32 clickable:1;
u32 reserved:30;
};
UI_WIDGET_FLAG_DISABLED = 1 << 0,
UI_WIDGET_FLAG_MOUSE_CLICKABLE = 1 << 1,
UI_WIDGET_FLAG_KEYBOARD_PRESSABLE = 1 << 2,
UI_WIDGET_FLAG_DRAW_TEXT = 1 << 3,
UI_WIDGET_FLAG_DRAW_BACKGROUND = 1 << 4,
UI_WIDGET_FLAG_OVERFLOW_X = 1 << 5,
UI_WIDGET_FLAG_OVERFLOW_Y = 1 << 6,
UI_WIDGET_FLAG_FLOATING_X = 1 << 7,
UI_WIDGET_FLAG_FLOATING_Y = 1 << 8,
} UI_WidgetFlagEnum;
UNION(UI_Rect)
UNION(UI_WidgetFlags)
{
struct
{
u32 x0;
u32 y0;
u32 x1;
u32 y1;
u64 disabled:1;
u64 mouse_clickable:1;
u64 keyboard_pressable:1;
u64 draw_text:1;
u64 draw_background:1;
u64 overflow_x:1;
u64 overflow_y:1;
u64 floating_x:1;
u64 floating_y:1;
};
u64 v;
};
static_assert(sizeof(UI_WidgetFlags) == sizeof(u64));
STRUCT(UI_Widget)
{
UI_WidgetFlags flags;
String string;
// Random category I temporarily introduce
String text;
UI_Widget* hash_previous;
UI_Widget* hash_next;
UI_Widget* first;
UI_Widget* last;
UI_Widget* next;
UI_Widget* previous;
UI_Widget* parent;
UI_Rect rect;
UI_Key key;
// Input parameters
UI_Size pref_size[AXIS2_COUNT];
Axis2 child_layout_axis;
UI_WidgetFlags flags;
// Data known after size determination happens
F32Vec2 computed_size;
F32Vec2 computed_relative_position;
// Data known after layout computation happens
F32Interval2 relative_rect;
F32Interval2 rect;
F32Vec2 relative_corner_delta[CORNER_COUNT];
// Persistent data across frames
u64 last_build_touched;
F32Vec2 view_offset;
Color background_color;
};
decl_vbp(UI_Widget);
STRUCT(UI_WidgetSlot)
{
UI_Widget* first;
UI_Widget* last;
};
declare_slice(UI_WidgetSlot);
decl_vb(Axis2);
decl_vb(Color);
STRUCT(UI_StateStackAutoPops)
{
u64 parent:1;
u64 pref_width:1;
u64 pref_height:1;
u64 child_layout_axis:1;
u64 text_color:1;
u64 background_color:1;
u64 font_size:1;
};
static_assert(sizeof(UI_StateStackAutoPops) % sizeof(u64) == 0);
STRUCT(UI_StateStackNulls)
{
UI_Widget* parent;
UI_Size pref_width;
UI_Size pref_height;
Axis2 child_layout_axis;
Color text_color;
Color background_color;
f32 font_size;
};
STRUCT(UI_StateStacks)
{
VirtualBufferP(UI_Widget) parent;
VirtualBuffer(UI_Size) pref_width;
VirtualBuffer(UI_Size) pref_height;
VirtualBuffer(Axis2) child_layout_axis;
VirtualBuffer(Color) text_color;
VirtualBuffer(Color) background_color;
VirtualBuffer(f32) font_size;
};
STRUCT(UI_State)
{
Arena* arena;
Arena* build_arenas[2];
Renderer* renderer;
RenderWindow* render;
RenderWindow* render_window;
OSWindow os_window;
u64 build_count;
f64 frame_time;
UI_Widget* root;
UI_MousePosition mouse_position;
Slice(UI_WidgetSlot) widget_table;
UI_Widget* free_widget_list;
u64 free_widget_count;
OSEventMouseButtonEvent mouse_button_events[OS_EVENT_MOUSE_BUTTON_COUNT];
u8 focused:1;
UI_StateStacks stacks;
UI_StateStackNulls stack_nulls;
UI_StateStackAutoPops stack_autopops;
};
enum
@ -75,6 +188,7 @@ STRUCT(UI_Signal)
};
};
EXPORT UI_State* ui_state_allocate(Renderer* renderer, RenderWindow* window);
EXPORT void ui_state_select(UI_State* state);
EXPORT u8 ui_build_begin(OSWindow window, f64 frame_time, OSEventQueue* event_queue);
EXPORT void ui_build_end();
@ -82,4 +196,4 @@ EXPORT void ui_draw();
EXPORT UI_Signal ui_signal_from_widget(UI_Widget* widget);
EXPORT UI_State* ui_state_get();
EXPORT UI_Widget* ui_widget_make(UI_WidgetFlags flags, String string, UI_Rect rect);
EXPORT UI_Widget* ui_widget_make(UI_WidgetFlags flags, String string);

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

@ -29,6 +29,8 @@ decl_vb(s64);
decl_vbp(s64);
decl_vb(String);
decl_vbp(char);
decl_vb(f32);
decl_vb(f64);
#define vb_size_of_element(vb) sizeof(*((vb)->pointer))
#define vb_add(vb, count) (typeof((vb)->pointer)) vb_generic_add((VirtualBuffer(u8)*)(vb), (vb_size_of_element(vb)), (count))

0
bootstrap/include/std/graphics.h → bootstrap/include/std/window.h
View File

75
bootstrap/std/base.c
View File

@ -6,8 +6,7 @@ u8 cast_u32_to_u8(u32 source, const char* name, int line)
#if BB_DEBUG
if (source > UINT8_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -22,8 +21,7 @@ u16 cast_u32_to_u16(u32 source, const char* name, int line)
#if BB_DEBUG
if (source > UINT16_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -38,8 +36,7 @@ s16 cast_u32_to_s16(u32 source, const char* name, int line)
#if BB_DEBUG
if (source > INT16_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -54,8 +51,7 @@ s32 cast_u32_to_s32(u32 source, const char* name, int line)
#if BB_DEBUG
if (source > INT32_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -70,8 +66,7 @@ u8 cast_u64_to_u8(u64 source, const char* name, int line)
#if BB_DEBUG
if (source > UINT8_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -86,8 +81,7 @@ u16 cast_u64_to_u16(u64 source, const char* name, int line)
#if BB_DEBUG
if (source > UINT16_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -102,8 +96,7 @@ u32 cast_u64_to_u32(u64 source, const char* name, int line)
#if BB_DEBUG
if (source > UINT32_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -118,8 +111,7 @@ s32 cast_u64_to_s32(u64 source, const char* name, int line)
#if BB_DEBUG
if (source > INT32_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -134,8 +126,7 @@ s64 cast_u64_to_s64(u64 source, const char* name, int line)
#if BB_DEBUG
if (source > INT64_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -150,13 +141,11 @@ u8 cast_s32_to_u8(s32 source, const char* name, int line)
#if BB_DEBUG
if (source < 0)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
if ((u32)source > UINT8_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -171,13 +160,11 @@ u16 cast_s32_to_u16(s32 source, const char* name, int line)
#if BB_DEBUG
if (source < 0)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
if ((u32)source > UINT16_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -192,8 +179,7 @@ u32 cast_s32_to_u32(s32 source, const char* name, int line)
#if BB_DEBUG
if (source < 0)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -208,8 +194,7 @@ u64 cast_s32_to_u64(s32 source, const char* name, int line)
#if BB_DEBUG
if (source < 0)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -224,13 +209,11 @@ s16 cast_s32_to_s16(s32 source, const char* name, int line)
#if BB_DEBUG
if (source > INT16_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
if (source < INT16_MIN)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -245,13 +228,11 @@ u16 cast_s64_to_u16(s64 source, const char* name, int line)
#if BB_DEBUG
if (source < 0)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
if (source > UINT16_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -266,8 +247,7 @@ u32 cast_s64_to_u32(s64 source, const char* name, int line)
#if BB_DEBUG
if (source < 0)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -282,8 +262,7 @@ u64 cast_s64_to_u64(s64 source, const char* name, int line)
#if BB_DEBUG
if (source < 0)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -298,14 +277,12 @@ s32 cast_s64_to_s32(s64 source, const char* name, int line)
#if BB_DEBUG
if (source < INT32_MIN)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
if (source > INT32_MAX)
{
print("Cast failed at {cstr}:{u32}\n", name, line);
trap();
my_panic("Cast failed at {cstr}:{u32}\n", name, line);
}
#else
unused(name);
@ -365,12 +342,6 @@ u64 parse_decimal(String string)
return value;
}
fn u64 safe_flag(u64 value, u64 flag)
{
u64 result = value & ((u64)0 - flag);
return result;
}
u8 get_next_ch_safe(String string, u64 index)
{
u64 next_index = index + 1;

4
bootstrap/std/font_provider.c
View File

@ -108,7 +108,7 @@ TextureAtlas font_texture_atlas_create(Arena* arena, Renderer* renderer, Texture
return result;
}
UVec2 texture_atlas_compute_string_rect(String string, const TextureAtlas* atlas)
U32Vec2 texture_atlas_compute_string_rect(String string, const TextureAtlas* atlas)
{
auto height = atlas->ascent - atlas->descent;
u32 x_offset = 0;
@ -122,5 +122,5 @@ UVec2 texture_atlas_compute_string_rect(String string, const TextureAtlas* atlas
x_offset += character->advance + kerning;
}
return (UVec2) { .x = x_offset, .y = y_offset };
return (U32Vec2) { .x = x_offset, .y = y_offset };
}

26
bootstrap/std/format.c
View File

@ -1087,7 +1087,7 @@ String format_string_va(String buffer, const char* format, va_list args)
if (next_ch == brace_open)
{
trap();
todo();
}
else
{
@ -1140,7 +1140,7 @@ String format_string_va(String buffer, const char* format, va_list args)
failed_execution();
}
it += 1;
failed_execution();
value_double = va_arg(args, f64);
break;
case '6':
it += 1;
@ -1200,7 +1200,7 @@ String format_string_va(String buffer, const char* format, va_list args)
format = INTEGER_FORMAT_BINARY;
break;
default:
trap();
unreachable();
}
it += 1;
@ -1218,7 +1218,7 @@ String format_string_va(String buffer, const char* format, va_list args)
original_value = va_arg(args, s64);
break;
default:
trap();
unreachable();
}
auto buffer_slice = s_get_slice(u8, buffer, buffer_i, buffer.length);
@ -1250,8 +1250,13 @@ String format_string_va(String buffer, const char* format, va_list args)
buffer_i += written_characters;
} break;
case INTEGER_FORMAT_OCTAL:
{
todo();
} break;
case INTEGER_FORMAT_BINARY:
trap();
{
todo();
} break;
}
}
else
@ -1303,7 +1308,7 @@ String format_string_va(String buffer, const char* format, va_list args)
format = INTEGER_FORMAT_BINARY;
break;
default:
trap();
unreachable();
}
it += 1;
@ -1321,7 +1326,7 @@ String format_string_va(String buffer, const char* format, va_list args)
original_value = va_arg(args, u64);
break;
default:
trap();
unreachable();
}
auto buffer_slice = s_get_slice(u8, buffer, buffer_i, buffer.length);
@ -1339,8 +1344,13 @@ String format_string_va(String buffer, const char* format, va_list args)
buffer_i += written_characters;
} break;
case INTEGER_FORMAT_OCTAL:
{
todo();
} break;
case INTEGER_FORMAT_BINARY:
trap();
{
todo();
} break;
}
} break;
default:

81
bootstrap/std/os.c
View File

@ -12,6 +12,7 @@
#include <sys/mman.h>
#include <sys/wait.h>
#include <sys/time.h>
#include <sys/ptrace.h>
#endif
#if LINK_LIBC
@ -990,24 +991,25 @@ void print(const char* format, ...)
}
static_assert(sizeof(Arena) == 64);
const global_variable u64 minimum_position = sizeof(Arena);
Arena* arena_init(u64 reserved_size, u64 granularity, u64 initial_size)
{
Arena* arena = (Arena*)os_reserve(0, reserved_size,
(OSReserveProtectionFlags) {
.read = 1,
.write = 1,
},
(OSReserveMapFlags) {
.priv = 1,
.anon = 1,
.noreserve = 1,
});
auto protection_flags = (OSReserveProtectionFlags) {
.read = 1,
.write = 1,
};
auto map_flags = (OSReserveMapFlags) {
.priv = 1,
.anon = 1,
.noreserve = 1,
};
Arena* arena = (Arena*)os_reserve(0, reserved_size, protection_flags, map_flags);
os_commit(arena, initial_size);
*arena = (Arena){
*arena = (Arena) {
.reserved_size = reserved_size,
.committed = initial_size,
.commit_position = sizeof(Arena),
.os_position = initial_size,
.position = minimum_position,
.granularity = granularity,
};
return arena;
@ -1020,21 +1022,21 @@ Arena* arena_init_default(u64 initial_size)
u8* arena_allocate_bytes(Arena* arena, u64 size, u64 alignment)
{
u64 aligned_offset = align_forward(arena->commit_position, alignment);
u64 aligned_offset = align_forward(arena->position, alignment);
u64 aligned_size_after = aligned_offset + size;
if (aligned_size_after > arena->committed)
if (aligned_size_after > arena->os_position)
{
u64 committed_size = align_forward(aligned_size_after, arena->granularity);
u64 size_to_commit = committed_size - arena->committed;
void* commit_pointer = (u8*)arena + arena->committed;
u64 size_to_commit = committed_size - arena->os_position;
void* commit_pointer = (u8*)arena + arena->os_position;
os_commit(commit_pointer, size_to_commit);
arena->committed = committed_size;
arena->os_position = committed_size;
}
auto* result = (u8*)arena + aligned_offset;
arena->commit_position = aligned_size_after;
assert(arena->commit_position <= arena->committed);
arena->position = aligned_size_after;
assert(arena->position <= arena->os_position);
return result;
}
@ -1064,8 +1066,8 @@ String arena_join_string(Arena* arena, Slice(String) pieces)
void arena_reset(Arena* arena)
{
arena->commit_position = sizeof(Arena);
memset(arena + 1, 0, arena->committed - sizeof(Arena));
arena->position = minimum_position;
memset(arena + 1, 0, arena->position - minimum_position);
}
#define transmute(D, source) *(D*)&source
@ -1231,7 +1233,7 @@ void run_command(Arena* arena, CStringSlice arguments, char* envp[])
if (pid == -1)
{
trap();
todo();
}
auto start_timestamp = os_timestamp();
@ -1242,12 +1244,10 @@ void run_command(Arena* arena, CStringSlice arguments, char* envp[])
// fcntl(pipes[1], F_SETFD, FD_CLOEXEC);
auto result = syscall_execve(arguments.pointer[0], arguments.pointer, envp);
#if LINK_LIBC
print("Execve failed! Error: {cstr}\n", strerror(errno));
my_panic("Execve failed! Error: {cstr}\n", strerror(errno));
#else
trap();
todo();
#endif
unused(result);
trap();
}
else
{
@ -1283,7 +1283,7 @@ void run_command(Arena* arena, CStringSlice arguments, char* envp[])
}
else
{
trap();
todo();
}
if (!success)
@ -1304,6 +1304,31 @@ void run_command(Arena* arena, CStringSlice arguments, char* envp[])
#endif
}
u8 os_is_being_debugged()
{
u8 result = 0;
#if _WIN32
result = IsDebuggerPresent();
#else
auto request =
#ifdef __APPLE__
PT_TRACE_ME;
#else
PTRACE_TRACEME;
#endif
if (ptrace(request, 0, 0, 0) == -1)
{
auto error = errno;
if (error == EPERM)
{
result = 1;
}
}
#endif
return result;
}
void print_string(String message)
{
#ifndef SILENT

6
bootstrap/std/render.c
View File

@ -264,8 +264,7 @@ fn String vulkan_result_to_string(VkResult result)
unused(line);
String result_name = vulkan_result_to_string(result);
print("Wrong Vulkan result {s} at \"{s}\" {s}:{u32}\n", result_name, call_string, file, line);
trap();
my_panic("Wrong Vulkan result {s} at \"{s}\" {s}:{u32}\n", result_name, call_string, file, line);
}
fn void buffer_copy_to_local_command(VkCommandBuffer command_buffer, Slice(LocalBufferCopy) copies)
@ -2265,6 +2264,7 @@ void window_render_text(Renderer* renderer, RenderWindow* window, String string,
auto* texture_atlas = &renderer->fonts[font_type];
auto height = texture_atlas->ascent - texture_atlas->descent;
auto texture_index = texture_atlas->texture.value;
for (u64 i = 0; i < string.length; i += 1)
{
auto ch = string.pointer[i];
@ -2329,7 +2329,7 @@ void window_render_text(Renderer* renderer, RenderWindow* window, String string,
}
}
UVec2 renderer_font_compute_string_rect(Renderer* renderer, RenderFontType type, String string)
U32Vec2 renderer_font_compute_string_rect(Renderer* renderer, RenderFontType type, String string)
{
auto* texture_atlas = &renderer->fonts[type];
auto result = texture_atlas_compute_string_rect(string, texture_atlas);

41
bootstrap/std/string.c
View File

@ -85,3 +85,44 @@ u8 string_ends_with(String string, String end)
return result;
}
u64 string_first_ocurrence(String string, String substring)
{
s32 result = UINT64_MAX;
if (substring.length < string.length)
{
for (u64 i = 0; i < string.length; i += 1)
{
if ((string.length - i) < substring.length)
{
break;
}
auto s = s_get_slice(u8, string, i, i + substring.length);
if (s_equal(s, substring))
{
result = i;
break;
}
}
}
else if (unlikely(substring.length == string.length))
{
if (unlikely(string.pointer == substring.pointer))
{
result = 0;
}
else if (memcmp(string.pointer, substring.pointer, substring.length) == 0)
{
result = 0;
}
}
return result;
}
u64 string_last_ocurrence(String string, String substring)
{
todo();
}

10
bootstrap/std/ui_builder.c
View File

@ -1,16 +1,14 @@
#include <std/ui_builder.h>
#include <std/render.h>
UI_Signal ui_button(String string, UI_Rect rect)
UI_Signal ui_button(String string)
{
auto rect_offset = renderer_font_compute_string_rect(ui_state_get()->renderer, RENDER_FONT_TYPE_PROPORTIONAL, string);
rect.x1 = rect.x0 + rect_offset.x;
rect.y1 = rect.y0 + rect_offset.y;
auto* widget = ui_widget_make((UI_WidgetFlags) {
.draw_text = 1,
.draw_background = 1,
.clickable = 1,
}, string, rect);
.mouse_clickable = 1,
.keyboard_pressable = 1,
}, string);
UI_Signal signal = ui_signal_from_widget(widget);
return signal;

671
bootstrap/std/ui_core.c
View File

@ -1,7 +1,56 @@
#include <std/ui_core.h>
#include <std/format.h>
#include <std/string.h>
global_variable UI_State* ui_state = 0;
#define ui_stack_autopop_set(field_name, value) ui_state->stack_autopops.field_name = (value)
#define ui_stack_push_impl(field_name, value, auto_pop_value) do \
{\
*vb_add(&ui_state->stacks.field_name, 1) = (value);\
ui_stack_autopop_set(field_name, auto_pop_value);\
} while (0)
fn u8* ui_pop_generic(VirtualBuffer(u8)* stack, u32 element_size)
{
auto length = stack->length;
assert(length > 0);
auto next_length = length - 1;
auto index = next_length;
auto* result = &stack->pointer[index * element_size];
stack->length = next_length;
return result;
}
#define ui_stack_push(field_name, value) ui_stack_push_impl(field_name, value, 0)
#define ui_stack_push_next_only(field_name, value) ui_stack_push_impl(field_name, value, 1)
#define ui_stack_pop(field_name) (typeof(ui_state->stacks.field_name.pointer)) ui_pop_generic(&ui_state->stacks.field_name, sizeof(*ui_state->stacks.field_name.pointer))
#define ui_stack_top(field_name) (ui_state->stacks.field_name.length ? ui_state->stacks.field_name.pointer[ui_state->stacks.field_name.length - 1] : ui_state->stack_nulls.field_name)
fn void ui_autopop(UI_State* state)
{
auto* restrict stack_end = (u32*)((u8*)&state->stacks + sizeof(state->stacks));
auto* restrict bitset_pointer = (u64*)&state->stack_autopops;
u64 bitset_index = 0;
for (auto* restrict stack_pointer = (u32*)&state->stacks; stack_pointer != stack_end; stack_pointer += sizeof(VirtualBuffer(u8)) / sizeof(u32))
{
auto bitset = *bitset_pointer;
auto shift_value = 1 << bitset_index;
auto autopop = (bitset & shift_value) != 0;
auto mask = ~shift_value;
*bitset_pointer = bitset & mask;
auto* restrict length_pointer = stack_pointer + (offsetof(VirtualBuffer(u8), length) / sizeof(u32));
auto current_length = *length_pointer;
assert(!autopop | current_length);
*length_pointer -= autopop;
u64 increment_bitset_element = (bitset_index > 0) & (bitset_index % 64 == 0);
bitset_pointer += increment_bitset_element;
bitset_index = increment_bitset_element ? 0 : bitset_index + 1;
}
}
void ui_state_select(UI_State* state)
{
@ -13,10 +62,312 @@ UI_State* ui_state_get()
return ui_state;
}
u8 ui_build_begin(OSWindow window, f64 frame_time, OSEventQueue* event_queue)
fn Arena* ui_build_arena()
{
auto* arena = ui_state->build_arenas[ui_state->build_count % array_length(ui_state->build_arenas)];
return arena;
}
fn UI_Key ui_key_null()
{
UI_Key key = {};
return key;
}
UI_State* ui_state_allocate(Renderer* renderer, RenderWindow* window)
{
Arena* arena = arena_init(GB(8), MB(2), MB(2));
UI_State* state = arena_allocate(arena, UI_State, 1);
state->renderer = renderer;
state->render_window = window;
state->arena = arena;
state->widget_table.length = 4096;
state->widget_table.pointer = arena_allocate(arena, UI_WidgetSlot, state->widget_table.length);
for (u64 i = 0; i < array_length(state->build_arenas); i += 1)
{
state->build_arenas[i] = arena_init(GB(8), MB(2), MB(2));
}
state->stack_nulls = (UI_StateStackNulls){
.parent = 0,
.child_layout_axis = AXIS2_COUNT,
.pref_width = {},
.pref_height = {},
};
auto* stack_end = (u32*)((u8*)&state->stacks + sizeof(state->stacks));
for (auto* stack_pointer = (u32*)&state->stacks; stack_pointer != stack_end; stack_pointer += sizeof(VirtualBuffer(u8)) / sizeof(u32))
{
auto* length_pointer = stack_pointer + (offsetof(VirtualBuffer(u8), length) / sizeof(u32));
assert(*length_pointer == 0);
}
return state;
}
fn u64 ui_widget_index_from_key(UI_Key key)
{
auto length = ui_state->widget_table.length;
assert(is_power_of_two(length));
return key.value & (length - 1);
}
auto text_end_delimiter = strlit("##");
auto hash_start_delimiter = strlit("###");
fn String ui_text_from_key_string(String string)
{
String result = string;
auto index = string_first_ocurrence(string, text_end_delimiter);
if (index < string.length)
{
result.length = index;
}
return result;
}
fn String ui_hash_from_key_string(String string)
{
String result = string;
auto index = string_first_ocurrence(string, hash_start_delimiter);
if (index < string.length)
{
result = s_get_slice(u8, string, index, string.length);
}
return result;
}
fn UI_Key ui_key_from_string(UI_Key seed, String string)
{
UI_Key key = ui_key_null();
if (string.length)
{
key = seed;
for (u64 i = 0; i < string.length; i += 1)
{
key.value = ((key.value << 5) + key.value) + string.pointer[i];
}
}
return key;
}
fn UI_Key ui_key_from_string_format(UI_Key seed, char* format, ...)
{
u8 buffer[256];
va_list args;
va_start(args, format);
auto string = format_string_va((String)array_to_slice(buffer), format, args);
va_end(args);
auto result = ui_key_from_string(seed, string);
return result;
}
fn u8 ui_key_equal(UI_Key a, UI_Key b)
{
return a.value == b.value;
}
UI_Widget* ui_widget_from_key(UI_Key key)
{
UI_Widget* result = 0;
if (!ui_key_equal(key, ui_key_null()))
{
auto index = ui_widget_index_from_key(key);
for (UI_Widget* widget = ui_state->widget_table.pointer[index].first; widget; widget = widget->hash_next)
{
if (ui_key_equal(widget->key, key))
{
result = widget;
break;
}
}
}
return result;
}
UI_Widget* ui_widget_make_from_key(UI_WidgetFlags flags, UI_Key key)
{
auto* widget = ui_widget_from_key(key);
static auto count = 0;
count += 1;
if (widget)
{
if (widget->last_build_touched == ui_state->build_count)
{
key = ui_key_null();
widget = 0;
}
}
u8 first_frame = 0;
if (!widget)
{
auto index = ui_widget_index_from_key(key);
first_frame = 1;
widget = arena_allocate(ui_state->arena, UI_Widget, 1);
auto* table_widget_slot = &ui_state->widget_table.pointer[index];
if (!table_widget_slot->last)
{
table_widget_slot->first = widget;
table_widget_slot->last = widget;
}
else
{
table_widget_slot->last->next = widget;
widget->previous = table_widget_slot->last;
table_widget_slot->last = widget;
}
}
auto* parent = ui_stack_top(parent);
if (parent)
{
if (!parent->last)
{
parent->last = widget;
parent->first = widget;
}
else
{
auto* previous_last = parent->last;
previous_last->next = widget;
parent->last = widget;
}
widget->parent = parent;
}
else
{
ui_state->root = widget;
}
auto color = count % 3 == 0;
widget->key = key;
widget->background_color = Color4(color, color, color, 1);
widget->flags = flags;
widget->first = 0;
widget->last = 0;
widget->last_build_touched = ui_state->build_count;
widget->pref_size[AXIS2_X] = ui_stack_top(pref_width);
widget->pref_size[AXIS2_Y] = ui_stack_top(pref_height);
widget->child_layout_axis = ui_stack_top(child_layout_axis);
ui_autopop(ui_state);
return widget;
}
UI_Widget* ui_widget_make(UI_WidgetFlags flags, String string)
{
// TODO:
auto seed = ui_key_null();
auto hash_string = ui_hash_from_key_string(string);
auto key = ui_key_from_string(seed, hash_string);
auto* widget = ui_widget_make_from_key(flags, key);
if (flags.draw_text)
{
widget->text = ui_text_from_key_string(string);
}
return widget;
}
UI_Widget* ui_widget_make_format(UI_WidgetFlags flags, const char* format, ...)
{
va_list args;
u8 buffer[4096];
va_start(args, format);
auto string = format_string_va((String)array_to_slice(buffer), format, args);
va_end(args);
auto* result = ui_widget_make(flags, string);
return result;
}
UI_Signal ui_signal_from_widget(UI_Widget* widget)
{
auto rect = widget->rect;
auto mouse_position = ui_state->mouse_position;
if (widget->flags.mouse_clickable & (ui_state->mouse_button_events[OS_EVENT_MOUSE_LEFT].action == OS_EVENT_MOUSE_RELEASE))
{
print("Clicked on {u32}x{u32}. Rect ({u32}, {u32}), ({u32}, {u32})\n", (u32)mouse_position.x, (u32)mouse_position.y, (u32)rect.p0.x, (u32)rect.p0.y, (u32)rect.p1.x, (u32)rect.p1.y);
}
UI_Signal signal = {
.clicked_left =
(widget->flags.mouse_clickable & (ui_state->mouse_button_events[OS_EVENT_MOUSE_LEFT].action == OS_EVENT_MOUSE_RELEASE)) &
((mouse_position.x >= rect.x0) & (mouse_position.x <= rect.x1)) &
((mouse_position.y >= rect.y0) & (mouse_position.y <= rect.y1)),
};
return signal;
}
fn void ui_stack_reset(UI_State* state)
{
auto* stack_end = (u32*)((u8*)&state->stacks + sizeof(state->stacks));
for (auto* stack_pointer = (u32*)&state->stacks; stack_pointer != stack_end; stack_pointer += sizeof(VirtualBuffer(u8)) / sizeof(u32))
{
auto* length_pointer = stack_pointer + (offsetof(VirtualBuffer(u8), length) / sizeof(u32));
*length_pointer = 0;
}
}
fn UI_Size ui_pixels(u32 width, f32 strictness)
{
return (UI_Size) {
.kind = UI_SIZE_PIXEL_COUNT,
.strictness = strictness,
.value = (f32)width,
};
}
fn UI_Size ui_percentage(f32 percentage, f32 strictness)
{
return (UI_Size) {
.kind = UI_SIZE_PERCENTAGE,
.strictness = strictness,
.value = percentage,
};
}
fn UI_Size ui_em(f32 value, f32 strictness)
{
return (UI_Size) {
.kind = UI_SIZE_PERCENTAGE,
.strictness = strictness,
.value = value * ui_stack_top(font_size),
};
}
u8 ui_build_begin(OSWindow os_window, f64 frame_time, OSEventQueue* event_queue)
{
ui_state->build_count += 1;
auto* build_arena = ui_build_arena();
arena_reset(build_arena);
ui_state->frame_time = frame_time;
ui_state->os_window = os_window;
ui_stack_reset(ui_state);
u8 open = 1;
for (u32 generic_event_index = 0; generic_event_index < event_queue->descriptors.length; generic_event_index += 1)
for (u32 generic_event_index = 0; open & (generic_event_index < event_queue->descriptors.length); generic_event_index += 1)
{
auto event_descriptor = event_queue->descriptors.pointer[generic_event_index];
u32 event_index = event_descriptor.index;
@ -74,22 +425,243 @@ u8 ui_build_begin(OSWindow window, f64 frame_time, OSEventQueue* event_queue)
}
}
auto framebuffer_size = os_window_framebuffer_size_get(window);
if (open)
{
// for (u64 i = 0; i < ui_state->widget_table.length; i += 1)
// {
// auto* widget_table_element = &ui_state->widget_table.pointer[i];
// for (UI_Widget* widget = widget_table_element->first, *next = 0; widget; widget = next)
// {
// next = widget->hash_next;
//
// if (ui_key_equal(widget->key, ui_key_null()) || widget->last_build_touched + 1 < ui_state->build_count)
// {
// // Remove from the list
// if (widget->hash_previous)
// {
// widget->hash_previous->hash_next = widget->hash_next;
// }
//
// if (widget->hash_next)
// {
// widget->hash_next->hash_previous = widget->hash_previous;
// }
//
// if (widget_table_element->first == widget)
// {
// widget_table_element->first = widget->hash_next;
// }
//
// if (widget_table_element->last == widget)
// {
// widget_table_element->last = widget->hash_previous;
// }
// }
// }
// }
ui_state->root = ui_widget_make(
(UI_WidgetFlags) {},
strlit(""),
(UI_Rect) {
.x0 = 0,
.y0 = 0,
.x1 = framebuffer_size.width,
.y1 = framebuffer_size.height,
}
);
auto framebuffer_size = os_window_framebuffer_size_get(os_window);
ui_stack_push_next_only(pref_width, ui_pixels(framebuffer_size.width, 1.0f));
ui_stack_push_next_only(pref_height, ui_pixels(framebuffer_size.height, 1.0f));
ui_stack_push_next_only(child_layout_axis, AXIS2_Y);
auto* root = ui_widget_make_format((UI_WidgetFlags) {}, "window_root_{u64}", os_window);
assert(!ui_state->stack_autopops.child_layout_axis);
ui_stack_push(parent, root);
ui_stack_push(font_size, 12);
ui_stack_push(text_color, Color4(1, 1, 1, 1));
ui_stack_push(background_color, Color4(0, 0, 0, 1));
ui_stack_push(pref_width, ui_percentage(1.0, 0.0));
ui_stack_push(pref_height, ui_em(1.8, 0.0));
}
return open;
}
fn void ui_compute_independent_sizes(UI_Widget* widget)
{
for (Axis2 axis = 0; axis < AXIS2_COUNT; axis += 1)
{
auto pref_size = widget->pref_size[axis];
switch (pref_size.kind)
{
default: break; case UI_SIZE_COUNT: unreachable();
case UI_SIZE_PIXEL_COUNT:
{
widget->computed_size.v[axis] = floorf(widget->pref_size[axis].value);
} break;
}
}
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
ui_compute_independent_sizes(child_widget);
}
}
fn void ui_compute_upward_dependent_sizes(UI_Widget* widget)
{
// TODO: optimize loop out if possible
for (Axis2 axis = 0; axis < AXIS2_COUNT; axis += 1)
{
auto pref_size = widget->pref_size[axis];
switch (pref_size.kind)
{
default: break; case UI_SIZE_COUNT: unreachable();
case UI_SIZE_PERCENTAGE:
{
for (UI_Widget* ancestor = widget->parent; ancestor; ancestor = ancestor->parent)
{
if (ancestor->pref_size[axis].kind != UI_SIZE_BY_CHILDREN)
{
widget->computed_size.v[axis] = floorf(ancestor->computed_size.v[axis] * widget->pref_size[axis].value);
break;
}
}
} break;
}
}
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
ui_compute_upward_dependent_sizes(child_widget);
}
}
fn void ui_compute_downward_dependent_sizes(UI_Widget* widget)
{
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
ui_compute_downward_dependent_sizes(child_widget);
}
for (Axis2 axis = 0; axis < AXIS2_COUNT; axis += 1)
{
auto pref_size = widget->pref_size[axis];
switch (pref_size.kind)
{
default: break; case UI_SIZE_COUNT: unreachable();
case UI_SIZE_BY_CHILDREN:
{
todo();
} break;
}
}
}
fn void ui_resolve_conflicts(UI_Widget* widget)
{
for (Axis2 axis = 0; axis < AXIS2_COUNT; axis += 1)
{
auto available_space = widget->computed_size.v[axis];
f32 taken_space = 0;
f32 total_fixup_budget = 0;
if (!(widget->flags.v & (UI_WIDGET_FLAG_OVERFLOW_X << axis)))
{
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
if (!(child_widget->flags.v & (UI_WIDGET_FLAG_FLOATING_X << axis)))
{
if (axis == widget->child_layout_axis)
{
taken_space += child_widget->computed_size.v[axis];
}
else
{
taken_space = MAX(taken_space, child_widget->computed_size.v[axis]);
}
auto fixup_budget_this_child = child_widget->computed_size.v[axis] * (1 - child_widget->pref_size[axis].strictness);
total_fixup_budget += fixup_budget_this_child;
}
}
auto conflict = taken_space - available_space;
if (conflict > 0 && total_fixup_budget > 0)
{
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
if (!(child_widget->flags.v & (UI_WIDGET_FLAG_FLOATING_X << axis)))
{
auto fixup_budget_this_child = child_widget->computed_size.v[axis] * (1 - child_widget->pref_size[axis].strictness);
f32 fixup_size_this_child = 0;
if (axis == widget->child_layout_axis)
{
fixup_size_this_child = fixup_budget_this_child * (conflict / total_fixup_budget);
}
else
{
fixup_size_this_child = child_widget->computed_size.v[axis] - available_space;
}
fixup_size_this_child = CLAMP(0, fixup_size_this_child, fixup_budget_this_child);
child_widget->computed_size.v[axis] = floorf(child_widget->computed_size.v[axis] - fixup_size_this_child);
}
}
}
}
if (axis == widget->child_layout_axis)
{
f32 p = 0;
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
if (!(child_widget->flags.v & (UI_WIDGET_FLAG_FLOATING_X << axis)))
{
child_widget->computed_relative_position.v[axis] = p;
p += child_widget->computed_size.v[axis];
}
}
}
else
{
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
if (!(child_widget->flags.v & (UI_WIDGET_FLAG_FLOATING_X << axis)))
{
child_widget->computed_relative_position.v[axis] = 0;
}
}
}
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
auto last_relative_rect = child_widget->relative_rect;
child_widget->relative_rect.p0.v[axis] = child_widget->computed_relative_position.v[axis];
child_widget->relative_rect.p1.v[axis] = child_widget->relative_rect.p0.v[axis] + child_widget->computed_size.v[axis];
F32Vec2 last_corner_01 = { .x = last_relative_rect.x0, .y = last_relative_rect.y1 };
F32Vec2 last_corner_10 = { .x = last_relative_rect.x1, .y = last_relative_rect.y0 };
F32Vec2 this_corner_01 = { .x = child_widget->relative_rect.x0, .y = child_widget->relative_rect.y1 };
F32Vec2 this_corner_10 = { .x = child_widget->relative_rect.x1, .y = child_widget->relative_rect.y0 };
child_widget->relative_corner_delta[CORNER_00].v[axis] = child_widget->relative_rect.p0.v[axis] - last_relative_rect.p0.v[axis];
child_widget->relative_corner_delta[CORNER_01].v[axis] = this_corner_01.v[axis] - last_corner_01.v[axis];
child_widget->relative_corner_delta[CORNER_10].v[axis] = this_corner_10.v[axis] - last_corner_10.v[axis];
child_widget->relative_corner_delta[CORNER_11].v[axis] = child_widget->relative_rect.p1.v[axis] - last_relative_rect.p1.v[axis];
child_widget->rect.p0.v[axis] = widget->rect.p0.v[axis] + child_widget->relative_rect.p0.v[axis] - widget->view_offset.v[axis];
child_widget->rect.p1.v[axis] = child_widget->rect.p0.v[axis] + child_widget->computed_size.v[axis];
if (!(child_widget->flags.v & (UI_WIDGET_FLAG_FLOATING_X << axis)))
{
child_widget->rect.p0.v[axis] = floorf(child_widget->rect.p0.v[axis]);
child_widget->rect.p1.v[axis] = floorf(child_widget->rect.p1.v[axis]);
}
}
for (UI_Widget* child_widget = widget->first; child_widget; child_widget = child_widget->next)
{
ui_resolve_conflicts(child_widget);
}
}
}
void ui_build_end()
{
// Clear release button presses
@ -101,9 +673,16 @@ void ui_build_end()
event->action = OS_EVENT_MOUSE_RELAX;
}
}
ui_stack_pop(parent);
ui_compute_independent_sizes(ui_state->root);
ui_compute_upward_dependent_sizes(ui_state->root);
ui_compute_downward_dependent_sizes(ui_state->root);
ui_resolve_conflicts(ui_state->root);
}
fn RenderRect render_rect(UI_Rect rect)
fn RenderRect render_rect(F32Interval2 rect)
{
return (RenderRect) {
.x0 = rect.x0,
@ -118,11 +697,12 @@ void ui_draw()
UI_Widget* root = ui_state->root;
UI_Widget* widget = root;
RenderWindow* window = ui_state->render;
RenderWindow* window = ui_state->render_window;
Renderer* renderer = ui_state->renderer;
while (1)
{
// print("Widget 0x{u64:x}. {u32} {u32} {u32} {u32}\n", widget, (u32)widget->rect.p0.x, (u32)widget->rect.p0.y, (u32)widget->rect.p1.x, (u32)widget->rect.p1.y);
if (widget->flags.draw_background)
{
window_render_rect(window, (RectDraw) {
@ -133,7 +713,8 @@ void ui_draw()
if (widget->flags.draw_text)
{
window_render_text(renderer, window, widget->string, Color4(1, 1, 1, 1), RENDER_FONT_TYPE_PROPORTIONAL, widget->rect.x0, widget->rect.y0);
// todo();
// window_render_text(renderer, window, widget->text_string, Color4(1, 1, 1, 1), RENDER_FONT_TYPE_PROPORTIONAL, widget->rect.x0, widget->rect.y0);
}
if (widget->first)
@ -154,64 +735,8 @@ void ui_draw()
}
else
{
unreachable();
break;
}
}
}
UI_Widget* ui_widget_make(UI_WidgetFlags flags, String string, UI_Rect rect)
{
auto* widget = arena_allocate(ui_state->arena, UI_Widget, 1);
*widget = (UI_Widget)
{
.string = string,
.flags = flags,
.rect = rect,
.background_color = Color4(0, 0, 0, 1),
// TODO: modify
.parent = ui_state->root,
};
auto* parent = widget->parent;
if (parent)
{
auto* ptr = &parent->last;
auto* previous_last = *ptr;
if (previous_last)
{
previous_last->next = widget;
}
*ptr = widget;
if (!parent->first)
{
parent->first = widget;
}
parent->last = widget;
}
return widget;
}
UI_Widget* ui_widget_make_format(UI_WidgetFlags flags, UI_Rect rect, const char* format, ...)
{
va_list args;
u8 buffer[4096];
va_start(args, format);
auto string = format_string_va((String)array_to_slice(buffer), format, args);
va_end(args);
auto* result = ui_widget_make(flags, string, rect);
return result;
}
UI_Signal ui_signal_from_widget(UI_Widget* widget)
{
UI_Rect rect = widget->rect;
UI_Signal signal = {
.clicked_left = (widget->flags.clickable & (ui_state->mouse_button_events[OS_EVENT_MOUSE_LEFT].action == OS_EVENT_MOUSE_RELEASE)) &
(ui_state->mouse_position.x >= rect.x0 & ui_state->mouse_position.x <= rect.x1) &
(ui_state->mouse_position.y >= rect.y0 & ui_state->mouse_position.y <= rect.y1),
};
return signal;
}

8
bootstrap/std/graphics.c → bootstrap/std/window.c
View File

@ -1,4 +1,4 @@
#include <std/graphics.h>
#include <std/window.h>
#define GLFW_INCLUDE_NONE
#include <GLFW/glfw3.h>
@ -13,14 +13,14 @@ fn void monitor_callback(GLFWmonitor* monitor, int event)
{
unused(monitor);
unused(event);
trap();
todo();
}
fn void joystick_callback(int joystick_id, int event)
{
unused(joystick_id);
unused(event);
trap();
todo();
}
fn void bitset_list_add(VirtualBuffer(OSEventBitset)* list, u32* counter, u64 value)
@ -314,6 +314,8 @@ fn void glfw_window_refresh_callback(GLFWwindow* w)
OSWindow os_window_create(OSWindowCreate create)
{
// glfwWindowHint(GLFW_MAXIMIZED, GLFW_TRUE);
GLFWmonitor* monitor = 0;
GLFWwindow* share = 0;
GLFWwindow* window = glfwCreateWindow(create.size.width, create.size.height, string_to_c(create.name), monitor, share);

2
dependencies/volk-1.3.301/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.10)
cmake_policy(PUSH)
cmake_policy(SET CMP0048 NEW) # project(... VERSION ...) support