1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00

Minor corrections in TxMemBuf.

This commit is contained in:
Sergey Lipskiy 2016-12-15 23:14:18 +07:00
parent 380725da53
commit 9bcc879bc6
2 changed files with 6 additions and 6 deletions

View File

@ -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<uint32*>(buf.data());
return buf.data();
}
void setTextureFormat(uint16 internalFormat, GHQTexInfo * info)

View File

@ -58,7 +58,7 @@ class TxMemBuf
private:
uint8 *_tex[2];
uint32 _size[2];
std::vector< std::vector<uint8> > _bufs;
std::vector< std::vector<uint32> > _bufs;
TxMemBuf();
public:
static TxMemBuf* getInstance() {