1 files changed, 56 insertions, 61 deletions

diff --git a/linden/indra/llrender/llimagegl.h b/linden/indra/llrender/llimagegl.h
index c7114c3..56f79ff 100644
--- a/linden/indra/llrender/llimagegl.h
+++ b/linden/indra/llrender/llimagegl.h
@@ -45,18 +45,23 @@
 #define BYTES_TO_MEGA_BYTES(x) ((x) >> 20)
 #define MEGA_BYTES_TO_BYTES(x) ((x) << 20)
 
+class LLTextureAtlas ;
 //============================================================================
+
 class LLImageGL : public LLRefCount
 {
         friend class LLTexUnit;
 public:
+        static std::list<U32> sDeadTextureList;
+
+        static void deleteDeadTextures();
+
         // Size calculation
         static S32 dataFormatBits(S32 dataformat);
         static S32 dataFormatBytes(S32 dataformat, S32 width, S32 height);
         static S32 dataFormatComponents(S32 dataformat);
 
         void updateBindStats(void) const;
-        void forceUpdateBindStats(void) const;
 
         // needs to be called every frame
         static void updateStats(F32 current_time);
@@ -65,10 +70,12 @@ public:
         static void destroyGL(BOOL save_state = TRUE);
         static void restoreGL();
 
-        // Sometimes called externally for textures not using LLImageGL (should go away...)     
-        static S32 updateBoundTexMemStatic(const S32 delta, const S32 size, S32 category) ;
-        S32 updateBoundTexMem()const;
-        
+        // Sometimes called externally for textures not using LLImageGL (should go away...)
+//#if !LL_RELEASE_FOR_DOWNLOAD
+//      static S32 updateBoundTexMem(const S32 delta, const S32 size) ;
+//#else
+        static S32 updateBoundTexMem(const S32 delta);
+//#endif
         static bool checkSize(S32 width, S32 height);
         
         // Not currently necessary for LLImageGL, but required in some derived classes,
@@ -90,7 +97,7 @@ protected:
 public:
         virtual void dump();    // debugging info to llinfos
         virtual bool bindError(const S32 stage = 0) const;
-        virtual bool bindDefaultImage(const S32 stage = 0) ;
+        virtual bool bindDefaultImage(const S32 stage = 0) const;
         virtual void forceImmediateUpdate() ;
 
         void setSize(S32 width, S32 height, S32 ncomponents);
@@ -102,15 +109,14 @@ public:
         static void setManualImage(U32 target, S32 miplevel, S32 intformat, S32 width, S32 height, U32 pixformat, U32 pixtype, const void *pixels);
 
         BOOL createGLTexture() ;
-        BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0, BOOL to_create = TRUE, 
-                S32 category = sMaxCatagories - 1);
+        BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0);
         BOOL createGLTexture(S32 discard_level, const U8* data, BOOL data_hasmips = FALSE, S32 usename = 0);
         void setImage(const LLImageRaw* imageraw);
         void setImage(const U8* data_in, BOOL data_hasmips = FALSE);
-        BOOL setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S32 width, S32 height, BOOL force_fast_update = FALSE);
-        BOOL setSubImage(const U8* datap, S32 data_width, S32 data_height, S32 x_pos, S32 y_pos, S32 width, S32 height, BOOL force_fast_update = FALSE);
+        BOOL setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S32 width, S32 height);
+        BOOL setSubImage(const U8* datap, S32 data_width, S32 data_height, S32 x_pos, S32 y_pos, S32 width, S32 height);
         BOOL setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height);
-
+        BOOL setDiscardLevel(S32 discard_level);
         // Read back a raw image for this discard level, if it exists
         BOOL readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compressed_ok); 
         void destroyGLTexture();
@@ -130,7 +136,7 @@ public:
         S32  getBytes(S32 discard_level = -1) const;
         S32  getMipBytes(S32 discard_level = -1) const;
         BOOL getBoundRecently() const;
-        BOOL isJustBound() const;
+        //BOOL isJustBound() const;
         LLGLenum getPrimaryFormat() const { return mFormatPrimary; }
 
         BOOL getHasGLTexture() const { return mTexName != 0; }
@@ -151,6 +157,8 @@ public:
         BOOL getUseDiscard() const { return mUseMipMaps && !mDontDiscard; }
         BOOL getDontDiscard() const { return mDontDiscard; }
 
+        BOOL isValidForSculpt(S32 discard_level, S32 image_width, S32 image_height, S32 ncomponents) ;
+
         void updatePickMask(S32 width, S32 height, const U8* data_in);
         BOOL getMask(const LLVector2 &tc);
 
@@ -176,8 +184,20 @@ public:
         void setActive() ;
         void forceActive() ;
         void setNoDelete() ;
+                
+        BOOL canAddToAtlas() ;
+        BOOL createGLTextureInAtlas(S32 discard_level, const LLImageRaw* imageraw, LLTextureAtlas* atlasp, S16 slot_col, S16 slot_row);
+        BOOL addToAtlas(const LLImageRaw* raw_image, LLTextureAtlas* atlasp, S16 slot_col, S16 slot_row) ;
+        
+        LLGLenum getTexTarget()const { return mTarget ;}
+        S8       getDiscardLevelInAtlas()const {return mDiscardLevelInAtlas;}
+        U32      getTexelsInAtlas()const { return mTexelsInAtlas ;}
+        U32      getTexelsInGLTexture()const {return mTexelsInGLTexture;}
 
-        void setTextureSize(S32 size) {mTextureMemory = size;}
+private:
+        void preAddToAtlas(S32 data_width) ;
+        void postAddToAtlas() ; 
+        
 protected:
         void init(BOOL usemipmaps);
         virtual void cleanup(); // Clean up the LLImageGL so it can be reinitialized.  Be careful when using this in derived class destructors
@@ -186,7 +206,7 @@ public:
         // Various GL/Rendering options
         S32 mTextureMemory;
         mutable F32  mLastBindTime;     // last time this was bound, by discard level
-        
+
 private:
         LLPointer<LLImageRaw> mSaveData; // used for destroyGL/restoreGL
         U8* mPickMask;  //downsampled bitmap approximation of alpha channel.  NULL if no alpha channel
@@ -202,8 +222,15 @@ private:
         U16      mWidth;
         U16      mHeight;       
         S8       mCurrentDiscardLevel;
-        
+
+        S8       mDiscardLevelInAtlas;
+        U32      mTexelsInAtlas ;
+        U32      mTexelsInGLTexture;
+
 protected:
+
+        BOOL mCanAddToAtlas ;
+
         LLGLenum mTarget;               // Normally GL_TEXTURE2D, sometimes something else (ex. cube maps)
         LLTexUnit::eTextureType mBindTarget;    // Normally TT_TEXTURE, sometimes something else (ex. cube maps)
         bool mHasMipMaps;
@@ -241,42 +268,18 @@ public:
         static S32 sCount;
         
         static F32 sLastFrameTime;
-        
+
         static LLGLuint sCurrentBoundTextures[MAX_GL_TEXTURE_UNITS]; // Currently bound texture ID
 
         // Global memory statistics
         static S32 sGlobalTextureMemoryInBytes;         // Tracks main memory texmem
-        static S32 sBoundTextureMemoryInBytes;  // Tracks bound texmem for last completed frame
+        static S32 sBoundTextureMemoryInBytes;                  // Tracks bound texmem for last completed frame
         static S32 sCurBoundTextureMemory;              // Tracks bound texmem for current frame
         static U32 sBindCount;                                  // Tracks number of texture binds for current frame
         static U32 sUniqueCount;                                // Tracks number of unique texture binds for current frame
         static BOOL sGlobalUseAnisotropic;
-#if DEBUG_MISS
-        BOOL mMissed; // Missed on last bind?
-        BOOL getMissed() const { return mMissed; };
-#else
-        BOOL getMissed() const { return FALSE; };
-#endif
-
-public:
-        static void initClass(S32 num_catagories) ;
-        static void cleanupClass() ;
-private:
-        static S32 sMaxCatagories ;
-
-        //the flag to allow to call readBackRaw(...).
-        //can be removed if we do not use that function at all.
-        static BOOL sAllowReadBackRaw ;
-//
-//****************************************************************************************************
-//The below for texture auditing use only
-//****************************************************************************************************
-private:
-        S32 mCategory ;
-public:         
-        void setCategory(S32 category) ;
-        S32  getCategory()const {return mCategory ;}
-
+        static BOOL sUseTextureAtlas ;
+#if !LL_RELEASE_FOR_DOWNLOAD
         //for debug use: show texture size distribution 
         //----------------------------------------
         static LLPointer<LLImageGL> sDefaultTexturep; //default texture to replace normal textures
@@ -287,27 +290,19 @@ public:
         static S32 sCurTexPickSize ;
 
         static S32 getTextureCounterIndex(U32 val) ;
-        static void incTextureCounterStatic(U32 val, S32 ncomponents, S32 category) ;
-        static void decTextureCounterStatic(U32 val, S32 ncomponents, S32 category) ;
-        static void setCurTexSizebar(S32 index, BOOL set_pick_size = TRUE) ;
+        static void incTextureCounter(U32 val) ;
+        static void decTextureCounter(U32 val) ;
+        static void setCurTexSizebar(S32 index) ;
         static void resetCurTexSizebar();
-
-        void incTextureCounter() ;
-        void decTextureCounter() ;
         //----------------------------------------
+#endif
 
-        //for debug use: show texture category distribution 
-        //----------------------------------------              
-        
-        static std::vector<S32> sTextureMemByCategory;
-        static std::vector<S32> sTextureMemByCategoryBound ;
-        static std::vector<S32> sTextureCurMemByCategoryBound ;
-        //----------------------------------------      
-//****************************************************************************************************
-//End of definitions for texture auditing use only
-//****************************************************************************************************
-
+#if DEBUG_MISS
+        BOOL mMissed; // Missed on last bind?
+        BOOL getMissed() const { return mMissed; };
+#else
+        BOOL getMissed() const { return FALSE; };
+#endif
 };
 
-extern BOOL gAuditTexture;
 #endif // LL_LLIMAGEGL_H