1 files changed, 22 insertions, 18 deletions

diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index 5c7a5ce821..5073701c30 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -39,6 +39,7 @@
 #include "llrender.h"
 #include "threadpool.h"
 #include "workqueue.h"
+#include <unordered_set>
 
 #define LL_IMAGEGL_THREAD_CHECK 0 //set to 1 to enable thread debugging for ImageGL
 
@@ -61,6 +62,9 @@ class LLImageGL : public LLRefCount
     friend class LLTexUnit;
 public:
 
+    // call once per frame
+    static void updateClass();
+
     // Get an estimate of how many bytes have been allocated in vram for textures.
     // Does not include mipmaps.
     // NOTE: multiplying this number by two gives a good estimate for total
@@ -83,9 +87,8 @@ public:
     // needs to be called every frame
     static void updateStats(F32 current_time);
 
-    // Save off / restore GL textures
-    static void destroyGL(bool save_state = true);
-    static void restoreGL();
+    // cleanup GL state
+    static void destroyGL();
     static void dirtyTexOptions();
 
     static bool checkSize(S32 width, S32 height);
@@ -148,6 +151,10 @@ public:
     S32  getDiscardLevel() const        { return mCurrentDiscardLevel; }
     S32  getMaxDiscardLevel() const     { return mMaxDiscardLevel; }
 
+    // override the current discard level
+    // should only be used for local textures where you know exactly what you're doing
+    void setDiscardLevel(S32 level) { mCurrentDiscardLevel = level; }
+
     S32  getCurrentWidth() const { return mWidth ;}
     S32  getCurrentHeight() const { return mHeight ;}
     S32  getWidth(S32 discard_level = -1) const;
@@ -194,26 +201,26 @@ public:
     void setFilteringOption(LLTexUnit::eTextureFilterOptions option);
     LLTexUnit::eTextureFilterOptions getFilteringOption(void) const { return mFilterOption; }
 
-    LLGLenum getTexTarget()const { return mTarget ;}
-    S8       getDiscardLevelInAtlas()const {return mDiscardLevelInAtlas;}
-    U32      getTexelsInAtlas()const { return mTexelsInAtlas ;}
-    U32      getTexelsInGLTexture()const {return mTexelsInGLTexture;}
-
+    LLGLenum getTexTarget()const { return mTarget; }
 
     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
 
     void setNeedsAlphaAndPickMask(bool need_mask);
 
-    bool preAddToAtlas(S32 discard_level, const LLImageRaw* raw_image);
-    void postAddToAtlas() ;
-
 #if LL_IMAGEGL_THREAD_CHECK
     // thread debugging
     std::thread::id mActiveThread;
     void checkActiveThread();
 #endif
 
+    // scale down to the desired discard level using GPU
+    // returns true if texture was scaled down
+    // desired discard will be clamped to max discard
+    // if desired discard is less than or equal to current discard, no scaling will occur
+    // only works for GL_TEXTURE_2D target
+    bool scaleDown(S32 desired_discard);
+
 public:
     // Various GL/Rendering options
     S64Bytes mTextureMemory;
@@ -240,15 +247,10 @@ private:
 
     bool     mGLTextureCreated ;
     LLGLuint mTexName;
-    //LLGLuint mNewTexName = 0; // tex name set by background thread to be applied in main thread
     U16      mWidth;
     U16      mHeight;
     S8       mCurrentDiscardLevel;
 
-    S8       mDiscardLevelInAtlas;
-    U32      mTexelsInAtlas ;
-    U32      mTexelsInGLTexture;
-
     bool mAllowCompression;
 
 protected:
@@ -275,9 +277,9 @@ protected:
 
     // STATICS
 public:
-    static std::set<LLImageGL*> sImageList;
+    static std::unordered_set<LLImageGL*> sImageList;
     static S32 sCount;
-
+    static U32 sFrameCount;
     static F32 sLastFrameTime;
 
     // Global memory statistics
@@ -301,6 +303,8 @@ public:
 private:
     static S32 sMaxCategories;
     static bool sSkipAnalyzeAlpha;
+    static U32 sScratchPBO;
+    static U32 sScratchPBOSize;
 
     //the flag to allow to call readBackRaw(...).
     //can be removed if we do not use that function at all.