#2315 Ensure textures are deleted when they are no longer referenced. (#2343)

* #2315 WIP -- Clean up deletion rules in texture list.  Incidental decruft.

* Touch up assertions.

* Move mLastReferencedTimer to LLViewerMediaTexture since it's no longer used by LLViewerTexture

Author: RunitaiLinden

indra/llrender/llgltexture.h

@@ -82,8 +82,6 @@ class LLGLTexture : public LLTexture
     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;

indra/newview/gltfscenemanager.cpp

@@ -357,7 +357,9 @@ void GLTFSceneManager::addGLTFObject(LLViewerObject* obj, LLUUID gltf_id)
 
     if (obj->mGLTFAsset)
     { // object already has a GLTF asset, don't reload it
-        llassert(std::find(mObjects.begin(), mObjects.end(), obj) != mObjects.end());
+
+        // TODO: below assertion fails on dupliate requests for assets -- possibly need to touch up asset loading state machine
+        // llassert(std::find(mObjects.begin(), mObjects.end(), obj) != mObjects.end());
         return;
     }
 

indra/newview/llappviewer.h

@@ -408,8 +408,6 @@ extern LLVector3 gRelativeWindVec;
 extern U32  gPacketsIn;
 extern bool gPrintMessagesThisFrame;
 
-extern LLUUID gBlackSquareID;
-
 extern bool gRandomizeFramerate;
 extern bool gPeriodicSlowFrame;
 

indra/newview/lldrawpoolavatar.cpp

@@ -62,8 +62,6 @@ S32     LLDrawPoolAvatar::sShadowPass = -1;
 S32 LLDrawPoolAvatar::sDiffuseChannel = 0;
 F32 LLDrawPoolAvatar::sMinimumAlpha = 0.2f;
 
-LLUUID gBlackSquareID;
-
 static bool is_deferred_render = false;
 static bool is_post_deferred_render = false;
 

indra/newview/llface.cpp

@@ -357,8 +357,6 @@ void LLFace::switchTexture(U32 ch, LLViewerTexture* new_texture)
         return;
     }
 
-    llassert(mTexture[ch].notNull());
-
     if (ch == LLRender::DIFFUSE_MAP)
     {
         getViewerObject()->changeTEImage(mTEOffset, new_texture) ;

indra/newview/lltextureview.cpp

@@ -836,7 +836,7 @@ void LLTextureView::draw()
         for (LLViewerTextureList::image_list_t::iterator iter = gTextureList.mImageList.begin();
              iter != gTextureList.mImageList.end(); )
         {
-            LLPointer<LLViewerFetchedTexture> imagep = *iter++;
+            LLViewerFetchedTexture* imagep = *iter++;
             if(!imagep->hasFetcher())
             {
                 continue ;

indra/newview/llviewertexture.cpp

@@ -1083,8 +1083,6 @@ void LLViewerFetchedTexture::init(bool firstinit)
     mKeptSavedRawImageTime = 0.f;
     mLastCallBackActiveTime = 0.f;
     mForceCallbackFetch = false;
-    mInDebug = false;
-    mUnremovable = false;
 
     mFTType = FTT_UNKNOWN;
 }
@@ -1234,32 +1232,6 @@ bool LLViewerFetchedTexture::isDeleted()
     return mTextureState == DELETED;
 }
 
-bool LLViewerFetchedTexture::isInactive()
-{
-    return mTextureState == INACTIVE;
-}
-
-bool LLViewerFetchedTexture::isDeletionCandidate()
-{
-    return mTextureState == DELETION_CANDIDATE;
-}
-
-void LLViewerFetchedTexture::setDeletionCandidate()
-{
-    if(mGLTexturep.notNull() && mGLTexturep->getTexName() && (mTextureState == INACTIVE))
-    {
-        mTextureState = DELETION_CANDIDATE;
-    }
-}
-
-//set the texture inactive
-void LLViewerFetchedTexture::setInactive()
-{
-    if(mTextureState == ACTIVE && mGLTexturep.notNull() && mGLTexturep->getTexName() && !mGLTexturep->getBoundRecently())
-    {
-        mTextureState = INACTIVE;
-    }
-}
 
 bool LLViewerFetchedTexture::isFullyLoaded() const
 {
@@ -1778,20 +1750,6 @@ S32 LLViewerFetchedTexture::getCurrentDiscardLevelForFetching()
     return current_discard;
 }
 
-bool LLViewerFetchedTexture::setDebugFetching(S32 debug_level)
-{
-    if(debug_level < 0)
-    {
-        mInDebug = false;
-        return false;
-    }
-    mInDebug = true;
-
-    mDesiredDiscardLevel = debug_level;
-
-    return true;
-}
-
 bool LLViewerFetchedTexture::isActiveFetching()
 {
     static LLCachedControl<bool> monitor_enabled(gSavedSettings,"DebugShowTextureInfo");

indra/newview/llviewertexture.h

@@ -146,8 +146,6 @@ class LLViewerTexture : public LLGLTexture
 
     virtual F32  getMaxVirtualSize() ;
 
-    LLFrameTimer* getLastReferencedTimer() {return &mLastReferencedTimer ;}
-
     S32 getFullWidth() const { return mFullWidth; }
     S32 getFullHeight() const { return mFullHeight; }
     /*virtual*/ void setKnownDrawSize(S32 width, S32 height);
@@ -197,7 +195,6 @@ class LLViewerTexture : public LLGLTexture
     mutable F32 mMaxVirtualSize = 0.f;  // The largest virtual size of the image, in pixels - how much data to we need?
     mutable S32  mMaxVirtualSizeResetCounter;
     mutable S32  mMaxVirtualSizeResetInterval;
-    LLFrameTimer mLastReferencedTimer;
 
     ll_face_list_t    mFaceList[LLRender::NUM_TEXTURE_CHANNELS]; //reverse pointer pointing to the faces using this image as texture
     U32               mNumFaces[LLRender::NUM_TEXTURE_CHANNELS];
@@ -339,11 +336,6 @@ class LLViewerFetchedTexture : public LLViewerTexture
 
     void setBoostLevel(S32 level) override;
     bool updateFetch();
-    bool setDebugFetching(S32 debug_level);
-    bool isInDebug() const { return mInDebug; }
-
-    void setUnremovable(bool value) { mUnremovable = value; }
-    bool isUnremovable() const { return mUnremovable; }
 
     void clearFetchedResults(); //clear all fetched results, for debug use.
 
@@ -378,10 +370,6 @@ class LLViewerFetchedTexture : public LLViewerTexture
     const std::string& getUrl() const {return mUrl;}
     //---------------
     bool isDeleted() ;
-    bool isInactive() ;
-    bool isDeletionCandidate();
-    void setDeletionCandidate() ;
-    void setInactive() ;
     bool getUseDiscard() const { return mUseMipMaps && !mDontDiscard; }
     //---------------
 
@@ -434,8 +422,6 @@ class LLViewerFetchedTexture : public LLViewerTexture
 
 private:
     bool  mFullyLoaded;
-    bool  mInDebug;
-    bool  mUnremovable;
     bool  mInFastCacheList;
     bool  mForceCallbackFetch;
 
@@ -586,6 +572,10 @@ class LLViewerMediaTexture : public LLViewerTexture
     /*virtual*/ void removeFace(U32 ch, LLFace* facep) ;
 
     /*virtual*/ F32  getMaxVirtualSize() ;
+
+    // get the timer that tracks the last time reinit was called
+    LLFrameTimer* getLastReferencedTimer() { return &mLastReferencedTimer; }
+
 private:
     void switchTexture(U32 ch, LLFace* facep) ;
     bool findFaces() ;
@@ -606,6 +596,9 @@ class LLViewerMediaTexture : public LLViewerTexture
     bool mIsPlaying ;
     U32  mUpdateVirtualSizeTime ;
 
+    // tracks last time reinit was called
+    LLFrameTimer mLastReferencedTimer;
+
 public:
     static void updateClass() ;
     static void cleanUpClass() ;