diff options
| author | Richard Linden <none@none> | 2013-06-04 19:45:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-04 19:45:33 -0700 |
| commit | a74b5dfa923f8eeccc9b786143f0f832de3ad450 (patch) | |
| tree | 8260cf490398677426fe040e79db1023c19cee8b /indra/newview/llviewertexture.h | |
| parent | 715385eed7b2276963015861d7e6b8196e6ae5cd (diff) | |
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
fixed mem stat tracking...now properly tracks memory footprint with floating point
precision
cleaned up macros for unit declaration
renamed units to SI standard for 1024 multiples (kibibytes, etc)
fixed units output for scene monitor dump
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index d69a0ffb72..ff1aef181b 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -39,8 +39,8 @@ #include <map> #include <list> -extern const LLUnit<LLUnits::Megabytes, S32> gMinVideoRam; -extern const LLUnit<LLUnits::Megabytes, S32> gMaxVideoRam; +extern const LLUnit<LLUnits::Mibibytes, S32> gMinVideoRam; +extern const LLUnit<LLUnits::Mibibytes, S32> gMaxVideoRam; class LLFace; class LLImageGL ; @@ -329,8 +329,8 @@ public: static F32 sDesiredDiscardScale; static LLUnit<LLUnits::Bytes, S32> sBoundTextureMemory; static LLUnit<LLUnits::Bytes, S32> sTotalTextureMemory; - static LLUnit<LLUnits::Megabytes, S32> sMaxBoundTextureMem; - static LLUnit<LLUnits::Megabytes, S32> sMaxTotalTextureMem; + static LLUnit<LLUnits::Mibibytes, S32> sMaxBoundTextureMem; + static LLUnit<LLUnits::Mibibytes, S32> sMaxTotalTextureMem; static LLUnit<LLUnits::Bytes, S32> sMaxDesiredTextureMem ; static S8 sCameraMovingDiscardBias; static F32 sCameraMovingBias; |