summaryrefslogtreecommitdiff
path: root/src/asset-manager.cpp
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2023-10-23 12:47:39 -0400
committerJonathan Bradley <jcb@pikum.xyz>2023-10-23 12:47:39 -0400
commitf400971f58a1c5e43d96e5bdce82d608ad88af3a (patch)
treeba5db54f1d9fe8d527da54663bf7e7aa54c586cb /src/asset-manager.cpp
parent4a61cc1e5ace3e59050d18493806c05487458cfd (diff)
memory manager now handles alignment
Diffstat (limited to 'src/asset-manager.cpp')
-rw-r--r--src/asset-manager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/asset-manager.cpp b/src/asset-manager.cpp
index d463cff..5ff25f3 100644
--- a/src/asset-manager.cpp
+++ b/src/asset-manager.cpp
@@ -31,11 +31,11 @@ AssetHandle AM_Register_Inner(const void *src, void *dst, int64_t size, const ch
return AssetHandle{assetHandle_T};
}
-AssetHandle AM_Register(const void *data, int64_t size, const char *key) {
+AssetHandle AM_Register(const void *data, int64_t size, std::size_t alignment, const char *key) {
assert(data != nullptr && "Attempt to register invalid asset data");
assert(data != CAFE_BABE(void) && "Attempt to register invalid asset data");
assert(size != 0 && "Attempt to register asset data of size 0");
- void *target = Pke_New(size);
+ void *target = Pke_New(size, alignment);
return AM_Register_Inner(data, target, size, key);
}
@@ -45,7 +45,7 @@ AssetHandle AM_Register(const char *path) {
throw "failed to open file";
}
auto fileSize = (int64_t)file.tellg();
- void *target = Pke_New(fileSize);
+ void *target = Pke_New(fileSize, alignof(uint64_t));
int64_t pathLen = strlen(path);
auto assetHandle = AM_Register_Inner(nullptr, target, 0, path + (pathLen > 16 ? pathLen - 16 : 0));