Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Double the maximum texture memory.

Browse Source
This commit is contained in:
Shyotl
2018-01-17 22:55:51 -06:00
parent 2195c2af37
commit a39844f9f3
9 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llimage/llimage.cpp
View File

@@ -281,7 +281,7 @@ U8* LLImageBase::allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 si
// LLImageRaw
//---------------------------------------------------------------------------
AIThreadSafeSimpleDC<S32> LLImageRaw::sGlobalRawMemory;
AIThreadSafeSimpleDC<S64> LLImageRaw::sGlobalRawMemory;
S32 LLImageRaw::sRawImageCount = 0;
S32 LLImageRaw::sRawImageCachedCount = 0;
@@ -358,7 +358,7 @@ LLImageRaw::~LLImageRaw()
U8* LLImageRaw::allocateData(S32 size)
{
U8* res = LLImageBase::allocateData(size);
*AIAccess<S32>(sGlobalRawMemory) += getDataSize();
*AIAccess<S64>(sGlobalRawMemory) += getDataSize();
return res;
}
@@ -367,7 +367,7 @@ U8* LLImageRaw::reallocateData(S32 size)
{
S32 old_data_size = getDataSize();
U8* res = LLImageBase::reallocateData(size);
*AIAccess<S32>(sGlobalRawMemory) += getDataSize() - old_data_size;
*AIAccess<S64>(sGlobalRawMemory) += getDataSize() - old_data_size;
return res;
}
@@ -375,7 +375,7 @@ U8* LLImageRaw::reallocateData(S32 size)
void LLImageRaw::deleteData()
{
{
*AIAccess<S32>(sGlobalRawMemory) -= getDataSize();
*AIAccess<S64>(sGlobalRawMemory) -= getDataSize();
}
LLImageBase::deleteData();
}
@@ -392,7 +392,7 @@ void LLImageRaw::setDataAndSize(U8 *data, S32 width, S32 height, S8 components)
LLImageBase::setSize(width, height, components) ;
LLImageBase::setDataAndSize(data, width * height * components) ;
*AIAccess<S32>(sGlobalRawMemory) += getDataSize();
*AIAccess<S64>(sGlobalRawMemory) += getDataSize();
}
BOOL LLImageRaw::resize(U16 width, U16 height, S8 components)