diff options
| -rw-r--r-- | assets/shaders/triangle.frag | 2 | ||||
| -rw-r--r-- | assets/shaders/triangle.vert | 4 | ||||
| -rw-r--r-- | src/core.c | 4 | ||||
| -rw-r--r-- | src/platform/file.h | 6 | ||||
| -rw-r--r-- | src/std/containers/darray.h | 3 |
5 files changed, 10 insertions, 9 deletions
diff --git a/assets/shaders/triangle.frag b/assets/shaders/triangle.frag index dd6d148..8455d04 100644 --- a/assets/shaders/triangle.frag +++ b/assets/shaders/triangle.frag @@ -6,5 +6,5 @@ layout(location = 0) in vec3 in_position; layout(location = 0) out vec4 out_colour; void main() { - out_colour = vec4(in_position.r + 0.5, in_position.g + 0.5, in_position.b + 0.5, 1.0); + out_colour = vec4(in_position.r + 0.5, in_position.g + 0.5, in_position.b + 0.5, 1.0); }
\ No newline at end of file diff --git a/assets/shaders/triangle.vert b/assets/shaders/triangle.vert index 3dcf931..e34112d 100644 --- a/assets/shaders/triangle.vert +++ b/assets/shaders/triangle.vert @@ -6,6 +6,6 @@ layout(location = 0) in vec3 in_position; layout(location = 0) out vec3 out_position; void main() { - gl_Position = vec4(in_position, 1.0); - out_position = in_position; + gl_Position = vec4(in_position, 1.0); + out_position = in_position; }
\ No newline at end of file @@ -7,8 +7,8 @@ #include "render_types.h" #include "threadpool.h" -#define SCR_WIDTH 2160 -#define SCR_HEIGHT 1080 +#define SCR_WIDTH 1000 +#define SCR_HEIGHT 1000 core* core_bringup() { INFO("Initiate Core bringup"); diff --git a/src/platform/file.h b/src/platform/file.h index 83d1317..a8aa8ea 100644 --- a/src/platform/file.h +++ b/src/platform/file.h @@ -19,8 +19,8 @@ const char* string_from_file(const char* path); str8_opt str8_from_file(arena* a, str8 path); typedef struct { - char *data; - size_t size; + char* data; + size_t size; } FileData; -FileData load_spv_file(const char *path);
\ No newline at end of file +FileData load_spv_file(const char* path);
\ No newline at end of file diff --git a/src/std/containers/darray.h b/src/std/containers/darray.h index 45d92e2..b15d269 100644 --- a/src/std/containers/darray.h +++ b/src/std/containers/darray.h @@ -6,7 +6,8 @@ // COPIED FROM KITC WITH SOME MINOR ADJUSTMENTS /* TODO: - - a 'find' function that takes a predicate (maybe wrap with a macro so we dont have to define a new function?) + - a 'find' function that takes a predicate (maybe wrap with a macro so we dont have to define a + new function?) */ #ifndef KITC_TYPED_ARRAY_H |