1 files changed, 17 insertions, 30 deletions

diff --git a/gfx/src/asset/asset_cache.c b/gfx/src/asset/asset_cache.c
index 0c6a8dc..2fa57ad 100644
--- a/gfx/src/asset/asset_cache.c
+++ b/gfx/src/asset/asset_cache.c
@@ -4,13 +4,11 @@
 #include <gfx/gfx.h>
 #include <gfx/util/scene.h>
 #include <gfx/util/texture.h>
+#include <gfx_assert.h>
 
 #include <cstring.h>
 #include <log/log.h>
 
-#include <assert.h>
-#include <stddef.h>
-
 static Hash calc_scene_hash(const LoadSceneCmd* cmd) {
   assert(cmd);
   switch (cmd->origin) {
@@ -19,7 +17,7 @@ static Hash calc_scene_hash(const LoadSceneCmd* cmd) {
   case AssetFromMemory:
     return (Hash)cmd->data;
   }
-  assert(false);
+  FAIL("Unhandled scene asset origin");
   return 0;
 }
 
@@ -59,7 +57,7 @@ static Hash calc_texture_hash(const LoadTextureCmd* cmd) {
     }
     break;
   }
-  assert(false);
+  FAIL("Unhandled texture asset origin");
   return 0;
 }
 
@@ -73,25 +71,16 @@ static Asset* lookup_cache(AssetCache* cache, Hash hash) {
   return 0;
 }
 
-// TODO: questionable function. Make mempool_alloc() fail when out of memory.
-static void insert_into_cache(AssetCache* cache, const Asset* asset) {
-  assert(cache);
-  assert(asset);
-  Asset* poolAsset = mempool_alloc(&cache->assets);
-  assert(asset);
-  *poolAsset = *asset;
-}
-
 static void log_scene_cache_hit(const LoadSceneCmd* cmd, Hash hash) {
   assert(cmd);
   switch (cmd->origin) {
   case AssetFromFile:
-    LOGI(
+    LOGD(
         "Found asset [%s] in cache with hash [%lu]",
         mstring_cstr(&cmd->filepath), hash);
     break;
   case AssetFromMemory:
-    LOGI("Found asset [%p] in cache with hash [%lu]", cmd->data, hash);
+    LOGD("Found asset [%p] in cache with hash [%lu]", cmd->data, hash);
     break;
   }
 }
@@ -100,10 +89,10 @@ static void log_scene_loaded(const LoadSceneCmd* cmd) {
   assert(cmd);
   switch (cmd->origin) {
   case AssetFromFile:
-    LOGI("Loaded asset from file: [%s]", mstring_cstr(&cmd->filepath));
+    LOGD("Loaded asset from file: [%s]", mstring_cstr(&cmd->filepath));
     break;
   case AssetFromMemory:
-    LOGI("Loaded asset from memory: [%p]", cmd->data);
+    LOGD("Loaded asset from memory: [%p]", cmd->data);
     break;
   }
 }
@@ -143,12 +132,11 @@ SceneNode* gfx_load_scene(
   // Load it, insert it into the cache, and return it.
   SceneNode* node = gfx_scene_load(gfx, root_node, cmd);
   if (node) {
-    insert_into_cache(
-        cache, &(Asset){
-                   .type = SceneAsset,
-                   .hash = hash,
-                   .data = node,
-               });
+    *(Asset*)mempool_alloc(&cache->assets) = (Asset){
+        .type = SceneAsset,
+        .hash = hash,
+        .data = node,
+    };
     log_scene_loaded(cmd);
   }
   return node;
@@ -172,12 +160,11 @@ Texture* gfx_load_texture(Gfx* gfx, const LoadTextureCmd* cmd) {
   RenderBackend* render_backend = gfx_get_render_backend(gfx);
   Texture*       texture        = gfx_texture_load(render_backend, cmd);
   if (texture) {
-    insert_into_cache(
-        cache, &(Asset){
-                   .type = TextureAsset,
-                   .hash = hash,
-                   .data = texture,
-               });
+    *(Asset*)mempool_alloc(&cache->assets) = (Asset){
+        .type = TextureAsset,
+        .hash = hash,
+        .data = texture,
+    };
   }
   return texture;
 }