12 files changed, 32 insertions, 19 deletions

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 7e60351..4db314d 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
+add_subdirectory(contrib/glad)
+
 project(gfx-app)
 
 add_library(gfx-app
@@ -9,6 +11,7 @@ target_include_directories(gfx-app PUBLIC
   include/)
 
 target_link_libraries(gfx-app PUBLIC
+  glad
   glfw
   log
   timer)
diff --git a/gfx/contrib/glad.zip b/app/contrib/glad.zip
index d5d3564..d5d3564 100644
--- a/gfx/contrib/glad.zip
+++ b/app/contrib/glad.zip
diff --git a/gfx/contrib/glad/CMakeLists.txt b/app/contrib/glad/CMakeLists.txt
index 08b550c..08b550c 100644
--- a/gfx/contrib/glad/CMakeLists.txt
+++ b/app/contrib/glad/CMakeLists.txt
diff --git a/gfx/contrib/glad/README.md b/app/contrib/glad/README.md
index a0c9908..a0c9908 100644
--- a/gfx/contrib/glad/README.md
+++ b/app/contrib/glad/README.md
diff --git a/gfx/contrib/glad/include/KHR/khrplatform.h b/app/contrib/glad/include/KHR/khrplatform.h
index dd22d92..dd22d92 100644
--- a/gfx/contrib/glad/include/KHR/khrplatform.h
+++ b/app/contrib/glad/include/KHR/khrplatform.h
diff --git a/gfx/contrib/glad/include/glad/glad.h b/app/contrib/glad/include/glad/glad.h
index 0556552..0556552 100644
--- a/gfx/contrib/glad/include/glad/glad.h
+++ b/app/contrib/glad/include/glad/glad.h
diff --git a/gfx/contrib/glad/src/glad.c b/app/contrib/glad/src/glad.c
index 4a3cf51..4a3cf51 100644
--- a/gfx/contrib/glad/src/glad.c
+++ b/app/contrib/glad/src/glad.c
diff --git a/app/include/gfx/app.h b/app/include/gfx/app.h
index ffff4bc..3843d92 100644
--- a/app/include/gfx/app.h
+++ b/app/include/gfx/app.h
@@ -60,6 +60,10 @@ typedef enum Key {
   KeyZ,
 } Key;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// Create a window with an OpenGL context and run the main loop.
 bool gfx_app_run(const GfxAppDesc*, const GfxAppCallbacks*);
 
@@ -69,6 +73,10 @@ void gfx_app_get_mouse_position(double* x, double* y);
 /// Return true if the given key is pressed.
 bool gfx_is_key_pressed(Key);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 /// Define a main function that initializes and puts the application in a loop.
 /// See also: gfx_app_run().
 #define GFX_APP_MAIN(WIDTH, HEIGHT, MAX_FPS, TITLE)                         \
@@ -86,10 +94,10 @@ bool gfx_is_key_pressed(Key);
             .app_state         = &app_state,                                \
         },                                                                  \
         &(GfxAppCallbacks){                                                 \
-            .init     = (GfxAppInit)app_init,                               \
-            .update   = (GfxAppUpdate)app_update,                           \
-            .render   = (GfxAppRender)app_render,                           \
-            .resize   = (GfxAppResize)app_resize,                           \
-            .shutdown = (GfxAppShutdown)app_end});                          \
+            .init     = (GfxAppInit)Init,                                   \
+            .shutdown = (GfxAppShutdown)Shutdown,                           \
+            .update   = (GfxAppUpdate)Update,                               \
+            .render   = (GfxAppRender)Render,                               \
+            .resize   = (GfxAppResize)Resize});                               \
     return 0;                                                               \
   }
diff --git a/app/src/app.c b/app/src/app.c
index b6d10ca..1e636af 100644
--- a/app/src/app.c
+++ b/app/src/app.c
@@ -1,5 +1,7 @@
 #include <gfx/app.h>
 
+#include <glad/glad.h>
+
 #include <GLFW/glfw3.h>
 #include <log/log.h>
 #include <timer.h>
@@ -110,6 +112,12 @@ bool gfx_app_run(const GfxAppDesc* desc, const GfxAppCallbacks* callbacks) {
   }
   glfwMakeContextCurrent(g_gfx_app.window);
 
+  // Load GL before calling the application init clalback.
+  if (!gladLoadGL()) {
+    LOGE("Failed loading glad!");
+    return 0;
+  }
+
   // Initialize the application's state before setting any callbacks.
   if (!(*g_gfx_app.callbacks.init)(
           g_gfx_app.app_state, desc->argc, desc->argv)) {
diff --git a/game/src/game.c b/game/src/game.c
index 425119f..10c69aa 100644
--- a/game/src/game.c
+++ b/game/src/game.c
@@ -115,9 +115,9 @@ static void resize_plugin(Game* game, int width, int height) {
   }
 }
 
-void app_end(Game* game);
+static void Shutdown(Game* game);
 
-bool app_init(Game* game, int argc, const char** argv) {
+static bool Init(Game* game, int argc, const char** argv) {
   assert(game);
 
   if (argc <= 1) {
@@ -170,11 +170,11 @@ bool app_init(Game* game, int argc, const char** argv) {
 
 cleanup:
   LOGE("Gfx error: %s", get_error());
-  app_end(game);
+  Shutdown(game);
   return false;
 }
 
-void app_end(Game* game) {
+static void Shutdown(Game* game) {
   assert(game);
   shutdown_plugin(game);
   if (game->gfx) {
@@ -188,7 +188,7 @@ void app_end(Game* game) {
   }
 }
 
-void app_update(Game* game, double t, double dt) {
+static void Update(Game* game, double t, double dt) {
   plugin_engine_update(game->plugin_engine);
   if (plugin_reloaded(game->plugin)) {
     shutdown_plugin(game);
@@ -203,14 +203,14 @@ void app_update(Game* game, double t, double dt) {
   update_plugin(game, t, dt);
 }
 
-void app_render(const Game* game) {
+static void Render(const Game* game) {
   GfxCore* gfxcore = gfx_get_core(game->gfx);
   gfx_start_frame(gfxcore);
   render_plugin(game);
   gfx_end_frame(gfxcore);
 }
 
-void app_resize(Game* game, int width, int height) {
+static void Resize(Game* game, int width, int height) {
   game->width  = width;
   game->height = height;
 
diff --git a/gfx/CMakeLists.txt b/gfx/CMakeLists.txt
index 7aa118b..7d629dc 100644
--- a/gfx/CMakeLists.txt
+++ b/gfx/CMakeLists.txt
@@ -4,7 +4,6 @@ include(cmake/shader.txt)
 
 add_subdirectory(contrib/cgltf)
 add_subdirectory(contrib/cgltf-tangents)
-add_subdirectory(contrib/glad)
 add_subdirectory(contrib/stb)
 
 project(gfx)
@@ -79,7 +78,7 @@ target_link_libraries(gfx PRIVATE
   cgltf
   cgltf-tangents
   error
-  glad
+  gfx-app
   log
   mempool
   shaders
diff --git a/gfx/src/gfx.c b/gfx/src/gfx.c
index 36020df..cd2ac90 100644
--- a/gfx/src/gfx.c
+++ b/gfx/src/gfx.c
@@ -19,11 +19,6 @@ typedef struct Gfx {
 } Gfx;
 
 Gfx* gfx_init(void) {
-  if (!gladLoadGL()) {
-    LOGE("Failed loading glad!");
-    return 0;
-  }
-
   Gfx* gfx = calloc(1, sizeof(Gfx));
   if (!gfx) {
     return 0;