From 0f12145db9f6b6856a785d33527406ae9ea35363 Mon Sep 17 00:00:00 2001 From: onelin Date: Thu, 10 Apr 2025 23:41:08 +0200 Subject: Rename Platform struct --- src/rendering/include/engine/rendering/window.h | 5 +++-- src/rendering/src/gl.c | 2 +- src/rendering/src/rendering.c | 2 +- src/rendering/src/window.c | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/rendering') diff --git a/src/rendering/include/engine/rendering/window.h b/src/rendering/include/engine/rendering/window.h index c902cad..edb510a 100644 --- a/src/rendering/include/engine/rendering/window.h +++ b/src/rendering/include/engine/rendering/window.h @@ -5,9 +5,10 @@ extern "C" { #endif -#include #include +#include + #ifndef ENGINE_RENDERING_WINDOW_H_EXCLUDE_EXTERNS extern void (*window_poll_events)(void); extern u64 (*get_time)(void); @@ -27,6 +28,7 @@ typedef struct { // Specifies the framwork & renderer combo used. Window_framework framework; Window_renderer renderer; + // Window *buffer* size, in pixels. ivec2 windowsize; @@ -48,7 +50,6 @@ void init_render_opengl(Window* w, const u32 flags); void get_mousepos(double *x, double *y); -#undef API #ifdef __cplusplus } #endif diff --git a/src/rendering/src/gl.c b/src/rendering/src/gl.c index 92599d7..920518f 100644 --- a/src/rendering/src/gl.c +++ b/src/rendering/src/gl.c @@ -11,7 +11,7 @@ #include #include -extern Platform* GLOBAL_PLATFORM; +extern Instance* GLOBAL_PLATFORM; const char* ShaderType_str[] = { [Shader_Error] = "Shader_Error", diff --git a/src/rendering/src/rendering.c b/src/rendering/src/rendering.c index 0403928..424d3d5 100644 --- a/src/rendering/src/rendering.c +++ b/src/rendering/src/rendering.c @@ -11,7 +11,7 @@ /* Extern globals */ -extern Platform* GLOBAL_PLATFORM; +extern Instance* GLOBAL_PLATFORM; /* Globals */ #define drawcall_limit (64 * 1024) diff --git a/src/rendering/src/window.c b/src/rendering/src/window.c index 9f5e861..3d163eb 100644 --- a/src/rendering/src/window.c +++ b/src/rendering/src/window.c @@ -19,7 +19,7 @@ #include -extern Platform* GLOBAL_PLATFORM; +extern Instance* GLOBAL_PLATFORM; void (*window_poll_events)(void) = NULL; @@ -71,12 +71,12 @@ GladGLContext* create_context(GLFWwindow *window) { } /* Should honestly just write my own */ -static inline u64 glfw_gettime_msec() { +static inline u64 glfw_gettime_msec(void) { return (u64)(glfwGetTime() * 1000.0); } /* Should honestly just write my own */ -static inline u64 glfw_gettime_usec() { +static inline u64 glfw_gettime_usec(void) { return (u64)(glfwGetTime() * 1000000.0); } -- cgit v1.3