From 09e9f611f8548e9d2e22a7cfa773c6838712c6df Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Sat, 14 Sep 2024 00:04:31 +0100 Subject: [PATCH] Reformat --- src/shader/shader.c | 16 +++++++--------- src/shader/shader.h | 21 ++++++++------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/shader/shader.c b/src/shader/shader.c index c161aca..d6c0b3b 100644 --- a/src/shader/shader.c +++ b/src/shader/shader.c @@ -5,16 +5,15 @@ typedef struct shader_repo ShaderRepo; struct shader_repo { - void *shaders[MAX_SHADER_COUNT]; - VertexShader *vertex_funcs[MAX_SHADER_COUNT]; + void *shaders[MAX_SHADER_COUNT]; + VertexShader *vertex_funcs[MAX_SHADER_COUNT]; FragmentShader *fragment_funcs[MAX_SHADER_COUNT]; - u64 count; + u64 count; }; internal ShaderRepo g_repository = {0}; -ShaderID register_shader(void *shader, VertexShader *vertex, - FragmentShader *fragment) { +ShaderID register_shader(void *shader, VertexShader *vertex, FragmentShader *fragment) { if (g_repository.count + 1 >= MAX_SHADER_COUNT) { return INVALID_SHADER; } @@ -27,8 +26,7 @@ ShaderID register_shader(void *shader, VertexShader *vertex, return (ShaderID){g_repository.count}; } -VertexData run_vertex_shader(ShaderID shader, const VertexData *vert, u8 index, - const Model *model) { +VertexData run_vertex_shader(ShaderID shader, const VertexData *vert, u8 index, const Model *model) { if (IS_INVALID_SHADER(shader) || shader.id > g_repository.count || !vert || !model) { return (VertexData){0}; } @@ -43,8 +41,8 @@ VertexData run_vertex_shader(ShaderID shader, const VertexData *vert, u8 index, return vertex_func(shader_obj, vert, index, model); } -FragmentResult run_fragment_shader(ShaderID shader, const V3f *barycentric, - const Colour *colour, const Model *model) { +FragmentResult run_fragment_shader(ShaderID shader, const V3f *barycentric, const Colour *colour, + const Model *model) { if (IS_INVALID_SHADER(shader) || shader.id > g_repository.count || !colour) { return DISCARDED_FRAGMENT; } diff --git a/src/shader/shader.h b/src/shader/shader.h index 3f606be..5aa6c6a 100644 --- a/src/shader/shader.h +++ b/src/shader/shader.h @@ -24,22 +24,17 @@ struct fragment_result { bool discard; }; -#define INVALID_SHADER ((ShaderID){0}) -#define IS_INVALID_SHADER(ID) (ID.id == 0) -#define DISCARDED_FRAGMENT ((FragmentResult){.discard = true}) +#define INVALID_SHADER ((ShaderID){0}) +#define IS_INVALID_SHADER(ID) (ID.id == 0) +#define DISCARDED_FRAGMENT ((FragmentResult){.discard = true}) #define DISCARD_FRAGMENT(RESULT) (RESULT.discard) -typedef VertexData(VertexShader)(void *shader, const VertexData *vert, u8 index, - const Model *model); -typedef FragmentResult(FragmentShader)(void *shader, const V3f *barycentric, - const Colour *colour, +typedef VertexData(VertexShader)(void *shader, const VertexData *vert, u8 index, const Model *model); +typedef FragmentResult(FragmentShader)(void *shader, const V3f *barycentric, const Colour *colour, const Model *model); -ShaderID register_shader(void *shader, VertexShader *vertex, - FragmentShader *fragment); -VertexData run_vertex_shader(ShaderID shader, const VertexData *vert, u8 index, - const Model *model); -FragmentResult run_fragment_shader(ShaderID shader, const V3f *barycentric, - const Colour *colour, const Model *model); +ShaderID register_shader(void *shader, VertexShader *vertex, FragmentShader *fragment); +VertexData run_vertex_shader(ShaderID shader, const VertexData *vert, u8 index, const Model *model); +FragmentResult run_fragment_shader(ShaderID shader, const V3f *barycentric, const Colour *colour, const Model *model); #endif // SHADER_H