aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerimage.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewerimage.h')
-rw-r--r--linden/indra/newview/llviewerimage.h13
1 files changed, 8 insertions, 5 deletions
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 @@
41#include <map> 41#include <map>
42#include <list> 42#include <list>
43 43
44#define MIN_VIDEO_RAM_IN_MEGA_BYTES 32
45#define MAX_VIDEO_RAM_IN_MEGA_BYTES 512 // 512MB max for performance reasons.
46
44class LLViewerImage; 47class LLViewerImage;
45 48
46typedef void (*loaded_callback_func)( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata ); 49typedef 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:
360 static LLTimer sEvaluationTimer; 363 static LLTimer sEvaluationTimer;
361 static F32 sDesiredDiscardBias; 364 static F32 sDesiredDiscardBias;
362 static F32 sDesiredDiscardScale; 365 static F32 sDesiredDiscardScale;
363 static S32 sBoundTextureMemory; 366 static S32 sBoundTextureMemoryInBytes;
364 static S32 sTotalTextureMemory; 367 static S32 sTotalTextureMemoryInBytes;
365 static S32 sMaxBoundTextureMem; 368 static S32 sMaxBoundTextureMemInMegaBytes;
366 static S32 sMaxTotalTextureMem; 369 static S32 sMaxTotalTextureMemInMegaBytes;
367 static S32 sMaxDesiredTextureMem ; 370 static S32 sMaxDesiredTextureMemInBytes ;
368 static BOOL sDontLoadVolumeTextures; 371 static BOOL sDontLoadVolumeTextures;
369}; 372};
370 373