diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
| commit | 57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch) | |
| tree | ea54edd04380696ef3f83671204fdae2f7ae298e /indra/newview/llviewertexture.h | |
| parent | c4c537e957458650a2948ffbd3a787f007d87f7a (diff) | |
| parent | eca30a22626b9a3e68e0e55f8da75614cd60d713 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 142c212435..0be1bf81de 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -98,6 +98,7 @@ public: DYNAMIC_TEXTURE, FETCHED_TEXTURE, LOD_TEXTURE, + ATLAS_TEXTURE, INVALID_TEXTURE_TYPE }; @@ -171,7 +172,6 @@ public: /*virtual*/S32 getHeight(S32 discard_level = -1) const; BOOL hasGLTexture() const ; - BOOL hasValidGLTexture() const ; LLGLuint getTexName() const ; BOOL createGLTexture() ; BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0); @@ -197,6 +197,11 @@ public: BOOL getMissed() const ; BOOL isValidForSculpt(S32 discard_level, S32 image_width, S32 image_height, S32 ncomponents) ; BOOL readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compressed_ok) const; + + U32 getTexelsInAtlas() const ; + U32 getTexelsInGLTexture() const ; + BOOL isGLTextureCreated() const ; + S32 getDiscardLevelInAtlas() const ; //--------------------------------------------------------------------------------------------- //end of functions to access LLImageGL //--------------------------------------------------------------------------------------------- @@ -263,6 +268,7 @@ public: static S32 sMaxTotalTextureMemInMegaBytes; static S32 sMaxDesiredTextureMemInBytes ; static BOOL sDontLoadVolumeTextures; + static BOOL sUseTextureAtlas ; static LLPointer<LLViewerTexture> sNullImagep; // Null texture for non-textured objects. }; @@ -388,6 +394,11 @@ private: F32 calcDecodePriorityForUnknownTexture(F32 pixel_priority) ; + //for atlas + void resetFaceAtlas() ; + void invalidateAtlas(BOOL rebuild_geom) ; + BOOL insertToAtlas() ; + private: BOOL mFullyLoaded; |