From 51d41041b76de676f72fabe29e6c87026a4bf627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 1 Jun 2015 17:45:40 -0700 Subject: [PATCH] Cleanup. --- examples/common/bgfx_utils.cpp | 11 ++++++++--- examples/common/bgfx_utils.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/examples/common/bgfx_utils.cpp b/examples/common/bgfx_utils.cpp index 1e4e90247..3943999d0 100644 --- a/examples/common/bgfx_utils.cpp +++ b/examples/common/bgfx_utils.cpp @@ -21,12 +21,12 @@ namespace stl = tinystl; #include "bgfx_utils.h" -void* load(bx::FileReaderI* _reader, const char* _filePath, uint32_t* _size) +void* load(bx::FileReaderI* _reader, bx::ReallocatorI* _allocator, const char* _filePath, uint32_t* _size) { if (0 == bx::open(_reader, _filePath) ) { uint32_t size = (uint32_t)bx::getSize(_reader); - void* data = malloc(size); + void* data = BX_ALLOC(_allocator, size); bx::read(_reader, data, size); bx::close(_reader); if (NULL != _size) @@ -45,7 +45,12 @@ void* load(bx::FileReaderI* _reader, const char* _filePath, uint32_t* _size) void* load(const char* _filePath, uint32_t* _size) { - return load(entry::getFileReader(), _filePath, _size); + return load(entry::getFileReader(), entry::getAllocator(), _filePath, _size); +} + +void unload(void* _ptr) +{ + BX_FREE(entry::getAllocator(), _ptr); } static const bgfx::Memory* loadMem(bx::FileReaderI* _reader, const char* _filePath) diff --git a/examples/common/bgfx_utils.h b/examples/common/bgfx_utils.h index 514028a99..6b7d1f05d 100644 --- a/examples/common/bgfx_utils.h +++ b/examples/common/bgfx_utils.h @@ -9,6 +9,7 @@ #include void* load(const char* _filePath, uint32_t* _size = NULL); +void unload(void* _ptr); bgfx::ShaderHandle loadShader(const char* _name); bgfx::ProgramHandle loadProgram(const char* _vsName, const char* _fsName); bgfx::TextureHandle loadTexture(const char* _name, uint32_t _flags = BGFX_TEXTURE_NONE, uint8_t _skip = 0, bgfx::TextureInfo* _info = NULL);