diff options
| author | Richard Linden <none@none> | 2012-11-08 23:42:18 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-08 23:42:18 -0800 |
| commit | 0bb0bd514b235948c1a21c81ab0e8ab6223b1990 (patch) | |
| tree | e0d49acc9074d0a5ed30c9c53fde908e5305b10f /indra/llrender/llimagegl.cpp | |
| parent | ed17c181dd37f56b808838748d289ee7bb5567ec (diff) | |
SH-3499 WIP Ensure asset stats output is correct
Finished making LLUnit implicitly convertible to/from scalar integer values
cleaned up test code
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rwxr-xr-x | indra/llrender/llimagegl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index fc1edbe664..5361d8e7be 100755 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -50,9 +50,9 @@ U32 wpo2(U32 i); U32 LLImageGL::sUniqueCount = 0; U32 LLImageGL::sBindCount = 0; -LLUnit::Bytes<S32> LLImageGL::sGlobalTextureMemory = 0; -LLUnit::Bytes<S32> LLImageGL::sBoundTextureMemory = 0; -LLUnit::Bytes<S32> LLImageGL::sCurBoundTextureMemory = 0; +LLUnit<LLUnits::Bytes, S32> LLImageGL::sGlobalTextureMemory = 0; +LLUnit<LLUnits::Bytes, S32> LLImageGL::sBoundTextureMemory = 0; +LLUnit<LLUnits::Bytes, S32> LLImageGL::sCurBoundTextureMemory = 0; S32 LLImageGL::sCount = 0; LLImageGL::dead_texturelist_t LLImageGL::sDeadTextureList[LLTexUnit::TT_NONE]; U32 LLImageGL::sCurTexName = 1; |