diff --git a/src/GLideNHQ/TxUtil.cpp b/src/GLideNHQ/TxUtil.cpp index b2fbea50..097640fd 100644 --- a/src/GLideNHQ/TxUtil.cpp +++ b/src/GLideNHQ/TxUtil.cpp @@ -602,19 +602,19 @@ TxMemBuf::size_of(uint32 num) uint32* TxMemBuf::getThreadBuf(uint32 threadIdx, uint32 num, uint32 size) { - const auto idx = threadIdx*2 + num; + assert(num < 2); + const auto idx = threadIdx * 2 + num; auto& buf = _bufs[idx]; - const auto bufSize = size * sizeof(uint32); - if (buf.size() < bufSize) { + if (buf.size() < size) { try { - buf.resize(bufSize, 0); + buf.resize(size, 0); } catch(std::bad_alloc) { return nullptr; } } - return reinterpret_cast(buf.data()); + return buf.data(); } void setTextureFormat(uint16 internalFormat, GHQTexInfo * info) diff --git a/src/GLideNHQ/TxUtil.h b/src/GLideNHQ/TxUtil.h index 9a56476a..37638eac 100644 --- a/src/GLideNHQ/TxUtil.h +++ b/src/GLideNHQ/TxUtil.h @@ -58,7 +58,7 @@ class TxMemBuf private: uint8 *_tex[2]; uint32 _size[2]; - std::vector< std::vector > _bufs; + std::vector< std::vector > _bufs; TxMemBuf(); public: static TxMemBuf* getInstance() {