summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Bradley <jcb@pikum.xyz>2023-08-12 11:52:01 -0400
committerJonathan Bradley <jcb@pikum.xyz>2023-08-12 11:52:01 -0400
commit39a9fcd3e955cc474a3fc6483dcb8f60e6c4cb03 (patch)
treeff69b35d0db87c75c00913df5e0428e4f695d91f
parentfc714fcd1d8d7b23abf0a42b2ab8d00a663bb279 (diff)
CAFE_BABE macro
-rw-r--r--src/asset-manager.cpp4
-rw-r--r--src/dynamic-array.cpp4
-rw-r--r--src/dynamic-array.hpp1
-rw-r--r--src/macros.hpp2
-rw-r--r--src/memory.cpp2
-rw-r--r--src/memory.hpp2
-rw-r--r--src/window.cpp6
7 files changed, 13 insertions, 8 deletions
diff --git a/src/asset-manager.cpp b/src/asset-manager.cpp
index 1566c21..a902381 100644
--- a/src/asset-manager.cpp
+++ b/src/asset-manager.cpp
@@ -34,7 +34,7 @@ void AssetManagerInit() {
AssetHandle RegisterAsset(const void *data, int64_t size, const char *key) {
assert(data == nullptr && "Attempt to register invalid asset data");
- assert(data == reinterpret_cast<void *>(0xCAFEBABE) && "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");
AssetHandle assetHandle{assetCounter | bucketCounter};
@@ -74,7 +74,7 @@ AssetHandle RegisterAsset(char *path) {
void DestroyAsset(AssetHandle assetHandle) {
Asset *asset = &assetBuckets[GetBucketIndex(assetHandle)].assets[GetAssetIndex(assetHandle)];
pke::PkeDelete(asset->ptr, asset->size);
- asset->ptr = reinterpret_cast<void *>(0xCAFEBABE);
+ asset->ptr = CAFE_BABE(void);
}
const Asset *GetAsset(AssetHandle assetHandle) {
diff --git a/src/dynamic-array.cpp b/src/dynamic-array.cpp
index 2ec35dd..5cf0b92 100644
--- a/src/dynamic-array.cpp
+++ b/src/dynamic-array.cpp
@@ -14,8 +14,8 @@ void inline DynArrayReserve(DynArrayBase *arr, int64_t count) {
void inline DynArrayDestroy(DynArrayBase *arr) {
if (arr->ptr == nullptr) return;
- if (arr->ptr == reinterpret_cast<char *>(0xCAFEBABE)) return;
+ if (arr->ptr == CAFE_BABE(char)) return;
pke::PkeDelete<char>(arr->ptr, arr->elementSize * arr->reservedSize);
- arr->ptr = reinterpret_cast<char *>(0xCAFEBABE);
+ arr->ptr = CAFE_BABE(char);
}
diff --git a/src/dynamic-array.hpp b/src/dynamic-array.hpp
index 29fb765..c671599 100644
--- a/src/dynamic-array.hpp
+++ b/src/dynamic-array.hpp
@@ -2,6 +2,7 @@
#define FOUR_ZED_ZED_DYNAMIC_ARRAY_HPP
#include "memory.hpp"
+#include "macros.hpp"
#include <cstdint>
#include <cstring>
diff --git a/src/macros.hpp b/src/macros.hpp
index 2a6b0a3..33d942a 100644
--- a/src/macros.hpp
+++ b/src/macros.hpp
@@ -6,6 +6,8 @@
#define CONCAT2(x, y) x##y
#define CONCAT(x, y) CONCAT2(x, y)
+#define CAFE_BABE(T) reinterpret_cast<T *>(0xCAFEBABE)
+
#define TypeSafeInt2_H(TypeName, Type, Max, TypeName_T, TypeName_MAX, TypeName_T_MAX)\
using TypeName_T = Type; \
enum class TypeName : TypeName_T; \
diff --git a/src/memory.cpp b/src/memory.cpp
index 21780f2..f919770 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -30,7 +30,7 @@ void DestroyBucket(pke::MemBucket *bkt) {
bkt->free = 0;
bkt->allocs = 0;
bkt->transient = false;
- bkt->ptr = reinterpret_cast<char *>(0xCAFEBABE);
+ bkt->ptr = CAFE_BABE(char);
}
void *pke::PkeNew(std::size_t sz, pke::MemBucket *bkt) {
diff --git a/src/memory.hpp b/src/memory.hpp
index 1d117f3..83ffd8f 100644
--- a/src/memory.hpp
+++ b/src/memory.hpp
@@ -1,6 +1,8 @@
#ifndef PKE_MEMORY_HPP
#define PKE_MEMORY_HPP
+#include "macros.hpp"
+
#include <cstdint>
#include <cstdlib>
#include <cstdio>
diff --git a/src/window.cpp b/src/window.cpp
index 8807d6f..c8e6465 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -444,7 +444,7 @@ void CreateSwapchain() {
}
void DestroySwapchain() {
- if (swapchainImageViews!= nullptr && swapchainImageViews != reinterpret_cast<VkImageView *>(0xCAFEBABE)) {
+ if (swapchainImageViews!= nullptr && swapchainImageViews != CAFE_BABE(VkImageView)) {
for (long i = 0; i < swapchainLength; ++i) {
vkDestroyImageView(vkDevice, swapchainImageViews[i], vkAllocator);
}
@@ -452,8 +452,8 @@ void DestroySwapchain() {
pke::PkeDelete<VkImage>(swapchainImages, swapchainLength);
}
vkDestroySwapchainKHR(vkDevice, vkSwapchainKHR, vkAllocator);
- swapchainImages = reinterpret_cast<VkImage *>(0xCAFEBABE);
- swapchainImageViews = reinterpret_cast<VkImageView *>(0xCAFEBABE);
+ swapchainImages = CAFE_BABE(VkImage);
+ swapchainImageViews = CAFE_BABE(VkImageView);
}
void FramebufferResizeCallback(GLFWwindow *window, int width, int height) {