diff options
| author | Richard Linden <none@none> | 2012-10-17 00:06:22 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-10-17 00:06:22 -0700 |
| commit | e6ca5471a2a816a24888ae1b38332531b22b7254 (patch) | |
| tree | 8eb0adb0db391bc775e79dee6486e2d51a6e3c04 /indra/newview/llviewertexture.h | |
| parent | 8d2f7a526545a10cd3669bf837a0b6f02cf5fe71 (diff) | |
SH-3275 Update viewer metrics system to be more flexible
put template parameter back in LLUnit units
added free function operators for mathematical manipulation of unit values
converted texture memory tracking to units
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rwxr-xr-x | indra/newview/llviewertexture.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 2ea9a07e9a..aa1e2010b4 100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -34,12 +34,13 @@ #include "llgltypes.h" #include "llrender.h" #include "llmetricperformancetester.h" +#include "llunit.h" #include <map> #include <list> -#define MIN_VIDEO_RAM_IN_MEGA_BYTES 32 -#define MAX_VIDEO_RAM_IN_MEGA_BYTES 512 // 512MB max for performance reasons. +extern const LLUnit::Megabytes<S32> gMinVideoRam; +extern const LLUnit::Megabytes<S32> gMaxVideoRam; class LLFace; class LLImageGL ; @@ -322,11 +323,11 @@ public: static LLFrameTimer sEvaluationTimer; static F32 sDesiredDiscardBias; static F32 sDesiredDiscardScale; - static S32 sBoundTextureMemoryInBytes; - static S32 sTotalTextureMemoryInBytes; - static S32 sMaxBoundTextureMemInMegaBytes; - static S32 sMaxTotalTextureMemInMegaBytes; - static S32 sMaxDesiredTextureMemInBytes ; + static LLUnit::Bytes<S32> sBoundTextureMemory; + static LLUnit::Bytes<S32> sTotalTextureMemory; + static LLUnit::Megabytes<S32> sMaxBoundTextureMem; + static LLUnit::Megabytes<S32> sMaxTotalTextureMem; + static LLUnit::Bytes<S32> sMaxDesiredTextureMem ; static S8 sCameraMovingDiscardBias; static F32 sCameraMovingBias; static S32 sMaxSculptRez ; |