diff options
author | 2016-02-21 11:35:58 +0100 | |
---|---|---|
committer | 2016-02-21 11:35:58 +0100 | |
commit | b5daabda5495dea5c50e17961ecfed2ea8619d76 (patch) | |
tree | f192bedcd7939c68d40a75a1901239be7f52de07 /3rdparty/bgfx/examples/common/bgfx_utils.cpp | |
parent | e57c90084c5d1dd9f6cdb0bbbf8782dc4f369cda (diff) | |
parent | c24b31a077c2103b27e4df67d3be825c0c7d379d (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Resolved Conflicts:
- src/osd/modules/render/d3d/d3dhlsl.cpp
Diffstat (limited to '3rdparty/bgfx/examples/common/bgfx_utils.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/common/bgfx_utils.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/3rdparty/bgfx/examples/common/bgfx_utils.cpp b/3rdparty/bgfx/examples/common/bgfx_utils.cpp index cdec2abbdfc..9b03d3d70b9 100644 --- a/3rdparty/bgfx/examples/common/bgfx_utils.cpp +++ b/3rdparty/bgfx/examples/common/bgfx_utils.cpp @@ -24,7 +24,7 @@ namespace stl = tinystl; void* load(bx::FileReaderI* _reader, bx::AllocatorI* _allocator, const char* _filePath, uint32_t* _size) { - if (0 == bx::open(_reader, _filePath) ) + if (bx::open(_reader, _filePath) ) { uint32_t size = (uint32_t)bx::getSize(_reader); void* data = BX_ALLOC(_allocator, size); @@ -45,6 +45,7 @@ void* load(bx::FileReaderI* _reader, bx::AllocatorI* _allocator, const char* _fi { *_size = 0; } + return NULL; } @@ -60,7 +61,7 @@ void unload(void* _ptr) static const bgfx::Memory* loadMem(bx::FileReaderI* _reader, const char* _filePath) { - if (0 == bx::open(_reader, _filePath) ) + if (bx::open(_reader, _filePath) ) { uint32_t size = (uint32_t)bx::getSize(_reader); const bgfx::Memory* mem = bgfx::alloc(size+1); @@ -76,7 +77,7 @@ static const bgfx::Memory* loadMem(bx::FileReaderI* _reader, const char* _filePa static void* loadMem(bx::FileReaderI* _reader, bx::AllocatorI* _allocator, const char* _filePath, uint32_t* _size) { - if (0 == bx::open(_reader, _filePath) ) + if (bx::open(_reader, _filePath) ) { uint32_t size = (uint32_t)bx::getSize(_reader); void* data = BX_ALLOC(_allocator, size); @@ -408,7 +409,9 @@ struct Mesh bx::AllocatorI* allocator = entry::getAllocator(); uint32_t chunk; - while (4 == bx::read(_reader, chunk) ) + bx::Error err; + while (4 == bx::read(_reader, chunk, &err) + && err.isOk() ) { switch (chunk) { @@ -596,10 +599,14 @@ Mesh* meshLoad(bx::ReaderSeekerI* _reader) Mesh* meshLoad(const char* _filePath) { bx::FileReaderI* reader = entry::getFileReader(); - bx::open(reader, _filePath); - Mesh* mesh = meshLoad(reader); - bx::close(reader); - return mesh; + if (bx::open(reader, _filePath) ) + { + Mesh* mesh = meshLoad(reader); + bx::close(reader); + return mesh; + } + + return NULL; } void meshUnload(Mesh* _mesh) |