From 0517fe4322443bdc317f8185590a63134e3f8394 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 13 Jun 2009 13:17:14 -0500 Subject: Second Life viewer sources 1.23.3-RC --- linden/indra/newview/llviewerimage.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'linden/indra/newview/llviewerimage.h') diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h index a5aef01..980ff56 100644 --- a/linden/indra/newview/llviewerimage.h +++ b/linden/indra/newview/llviewerimage.h @@ -41,6 +41,9 @@ #include #include +#define MIN_VIDEO_RAM_IN_MEGA_BYTES 32 +#define MAX_VIDEO_RAM_IN_MEGA_BYTES 512 // 512MB max for performance reasons. + class LLViewerImage; typedef void (*loaded_callback_func)( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata ); @@ -360,11 +363,11 @@ public: static LLTimer sEvaluationTimer; static F32 sDesiredDiscardBias; static F32 sDesiredDiscardScale; - static S32 sBoundTextureMemory; - static S32 sTotalTextureMemory; - static S32 sMaxBoundTextureMem; - static S32 sMaxTotalTextureMem; - static S32 sMaxDesiredTextureMem ; + static S32 sBoundTextureMemoryInBytes; + static S32 sTotalTextureMemoryInBytes; + static S32 sMaxBoundTextureMemInMegaBytes; + static S32 sMaxTotalTextureMemInMegaBytes; + static S32 sMaxDesiredTextureMemInBytes ; static BOOL sDontLoadVolumeTextures; }; -- cgit v1.1