summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-20 10:27:18 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-20 10:27:18 -0500
commitcbf24c55d511b2390fdc4c12698682531f26f41b (patch)
treea78771e2c383507bdccd58ceed5bc82220a3b4c8 /indra/llrender
parent42496cd672436cc4d32f5546fd04294931b8f0b6 (diff)
SH-3344 WIP - additional debugging output for avatar local textures
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llgltexture.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h
index b1efe77519..e69b322d60 100644
--- a/indra/llrender/llgltexture.h
+++ b/indra/llrender/llgltexture.h
@@ -79,6 +79,15 @@ public:
MAX_GL_IMAGE_CATEGORY
};
+ typedef enum
+ {
+ DELETED = 0, //removed from memory
+ DELETION_CANDIDATE, //ready to be removed from memory
+ INACTIVE, //not be used for the last certain period (i.e., 30 seconds).
+ ACTIVE, //just being used, can become inactive if not being used for a certain time (10 seconds).
+ NO_DELETE = 99 //stay in memory, can not be removed.
+ } LLGLTextureState;
+
static S32 getTotalNumOfCategories() ;
static S32 getIndexFromCategory(S32 category) ;
static S32 getCategoryFromIndex(S32 index) ;
@@ -143,6 +152,8 @@ public:
U32 getTexelsInGLTexture() const ;
BOOL isGLTextureCreated() const ;
S32 getDiscardLevelInAtlas() const ;
+ LLGLTextureState getTextureState() const { return mTextureState; }
+
//---------------------------------------------------------------------------------------------
//end of functions to access LLImageGL
//---------------------------------------------------------------------------------------------
@@ -179,14 +190,6 @@ protected:
S8 mDontDiscard; // Keep full res version of this image (for UI, etc)
protected:
- typedef enum
- {
- DELETED = 0, //removed from memory
- DELETION_CANDIDATE, //ready to be removed from memory
- INACTIVE, //not be used for the last certain period (i.e., 30 seconds).
- ACTIVE, //just being used, can become inactive if not being used for a certain time (10 seconds).
- NO_DELETE = 99 //stay in memory, can not be removed.
- } LLGLTextureState;
LLGLTextureState mTextureState ;