1 files changed, 66 insertions, 85 deletions

diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 0b70f51..33210cf 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -149,23 +149,13 @@ F32 texmem_middle_bound_scale = 0.925f;
 //static
 void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity)
 {
-        sBoundTextureMemory = LLImageGL::sBoundTextureMemory;
-        sTotalTextureMemory = LLImageGL::sGlobalTextureMemory;
-        sMaxBoundTextureMem = gImageList.getMaxResidentTexMem();
-        
-        sMaxTotalTextureMem = sMaxBoundTextureMem * 2;
-        if (sMaxBoundTextureMem > 64000000)
-        {
-                sMaxTotalTextureMem -= sMaxBoundTextureMem/4;
-        }
-        
-        if ((U32)sMaxTotalTextureMem > gSysMemory.getPhysicalMemoryClamped() - (U32)min_non_tex_system_mem)
-        {
-                sMaxTotalTextureMem = (S32)gSysMemory.getPhysicalMemoryClamped() - min_non_tex_system_mem;
-        }
-        
-        if (sBoundTextureMemory >= sMaxBoundTextureMem ||
-                sTotalTextureMemory >= sMaxTotalTextureMem)
+        sBoundTextureMemory = LLImageGL::sBoundTextureMemory;//in bytes
+        sTotalTextureMemory = LLImageGL::sGlobalTextureMemory;//in bytes
+        sMaxBoundTextureMem = gImageList.getMaxResidentTexMem();//in MB 
+        sMaxTotalTextureMem = gImageList.getMaxTotalTextureMem() ;//in MB
+
+        if ((sBoundTextureMemory >> 20) >= sMaxBoundTextureMem ||
+                (sTotalTextureMemory >> 20) >= sMaxTotalTextureMem)
         {
                 // If we are using more texture memory than we should,
                 // scale up the desired discard level
@@ -176,8 +166,8 @@ void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity)
                 }
         }
         else if (sDesiredDiscardBias > 0.0f &&
-                         sBoundTextureMemory < sMaxBoundTextureMem*texmem_lower_bound_scale &&
-                         sTotalTextureMemory < sMaxTotalTextureMem*texmem_lower_bound_scale)
+                         (sBoundTextureMemory >> 20) < sMaxBoundTextureMem*texmem_lower_bound_scale &&
+                         (sTotalTextureMemory >> 20) < sMaxTotalTextureMem*texmem_lower_bound_scale)
         {
                 // If we are using less texture memory than we should,
                 // scale down the desired discard level
@@ -248,7 +238,6 @@ void LLViewerImage::init(bool firstinit)
         mTexelsPerImage = 64.f*64.f;
         mMaxVirtualSize = 0.f;
         mDiscardVirtualSize = 0.f;
-        mMaxCosAngle = -1.f;
         mRequestedDiscardLevel = -1;
         mRequestedDownloadPriority = 0.f;
         mFullyLoaded = FALSE;
@@ -432,20 +421,12 @@ BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
 
 //============================================================================
 
-void LLViewerImage::addTextureStats(F32 pixel_area,
-                                                                    F32 texel_area_ratio, // = 1.0
-                                                                    F32 cos_center_angle) const // = 1.0
+void LLViewerImage::addTextureStats(F32 virtual_size) const // = 1.0
 {
-        F32 virtual_size = pixel_area / texel_area_ratio;
         if (virtual_size > mMaxVirtualSize)
         {
                 mMaxVirtualSize = virtual_size;
         }
-        cos_center_angle = llclamp(cos_center_angle, -1.f, 1.f);
-        if (cos_center_angle > mMaxCosAngle)
-        {
-                mMaxCosAngle = cos_center_angle;
-        }
 }
 
 void LLViewerImage::resetTextureStats(BOOL zero)
@@ -453,12 +434,10 @@ void LLViewerImage::resetTextureStats(BOOL zero)
         if (zero)
         {
                 mMaxVirtualSize = 0.0f;
-                mMaxCosAngle = -1.0f;
         }
-        else if (getBoostLevel() != LLViewerImage::BOOST_SCULPTED) //don't decay sculpted prim textures
+        else
         {
                 mMaxVirtualSize -= mMaxVirtualSize * .10f; // decay by 5%/update
-                mMaxCosAngle = -1.0f;
         }
 }
 
@@ -477,7 +456,7 @@ void LLViewerImage::processTextureStats()
                 // If the image has not been significantly visible in a while, we don't want it
                 mDesiredDiscardLevel = llmin(mMinDesiredDiscardLevel, (S8)(MAX_DISCARD_LEVEL + 1));
         }
-        else if ((!mFullWidth && !mWidth)  || (!mFullHeight && !mHeight))
+        else if ((!mFullWidth && !getCurrentWidth())  || (!mFullHeight && !getCurrentHeight()))
         {
                 mDesiredDiscardLevel =  mMaxDiscardLevel;
         }
@@ -558,7 +537,7 @@ void LLViewerImage::processTextureStats()
                 if ((sDesiredDiscardBias > 0.0f) &&
                         (current_discard >= 0 && mDesiredDiscardLevel >= current_discard))
                 {
-                        if ( sBoundTextureMemory > sMaxBoundTextureMem*texmem_middle_bound_scale)
+                        if ( (sBoundTextureMemory >> 20) > sMaxBoundTextureMem*texmem_middle_bound_scale)
                         {
                                 // Limit the amount of GL memory bound each frame
                                 if (mDesiredDiscardLevel > current_discard)
@@ -566,7 +545,7 @@ void LLViewerImage::processTextureStats()
                                         increase_discard = TRUE;
                                 }
                         }
-                        if ( sTotalTextureMemory > sMaxTotalTextureMem*texmem_middle_bound_scale)
+                        if ( (sTotalTextureMemory >> 20) > sMaxTotalTextureMem*texmem_middle_bound_scale)
                         {
                                 // Only allow GL to have 2x the video card memory
                                 if (!getBoundRecently())
@@ -608,7 +587,7 @@ F32 LLViewerImage::calcDecodePriority()
         F32 priority;
         S32 cur_discard = getDiscardLevel();
         bool have_all_data = (cur_discard >= 0 && (cur_discard <= mDesiredDiscardLevel));
-        F32 pixel_priority = fsqrtf(mMaxVirtualSize) * (1.f + mMaxCosAngle);
+        F32 pixel_priority = fsqrtf(mMaxVirtualSize);
         const S32 MIN_NOT_VISIBLE_FRAMES = 30; // NOTE: this function is not called every frame
         mDecodeFrame++;
         if (pixel_priority > 0.f)
@@ -648,17 +627,12 @@ F32 LLViewerImage::calcDecodePriority()
                         return mDecodePriority;
                 }
         }
-        else if ((mBoostLevel == LLViewerImage::BOOST_SCULPTED) && !have_all_data)
-        {
-                // Sculpted images are small, treat them like they always have no data.
-                priority = 900000.f;
-        }
         else if (cur_discard < 0)
         {
-                // We don't have any data yet, so we don't know the size of the image, treat as 1024x1024
+                // We don't have any data yet, so we don't know the size of the image, treat as 32x32
 //              priority = 900000.f;
                 static const F64 log_2 = log(2.0);
-                F32 desired = (F32)(log(1024.0/pixel_priority) / log_2);
+                F32 desired = (F32)(log(32.0/pixel_priority) / log_2);
                 S32 ddiscard = MAX_DISCARD_LEVEL - (S32)desired + 1;
                 ddiscard = llclamp(ddiscard, 1, 9);
                 priority = ddiscard*100000.f;
@@ -712,14 +686,7 @@ F32 LLViewerImage::maxDecodePriority()
 void LLViewerImage::setDecodePriority(F32 priority)
 {
         llassert(!mInImageList);
-        if (priority < 0.0f)
-        {
-                mDecodePriority = calcDecodePriority();
-        }
-        else
-        {
-                mDecodePriority = priority;
-        }
+        mDecodePriority = priority;
 }
 
 void LLViewerImage::setBoostLevel(S32 level)
@@ -776,6 +743,7 @@ bool LLViewerImage::updateFetch()
         S32 current_discard = getDiscardLevel();
         S32 desired_discard = getDesiredDiscardLevel();
         F32 decode_priority = getDecodePriority();
+        decode_priority = llmax(decode_priority, 0.0f);
         
         if (mIsFetching)
         {
@@ -793,7 +761,7 @@ bool LLViewerImage::updateFetch()
                 else
                 {
                         mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
-                                                                                                           mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
+                                                                                                                                                mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
                 }
                 
                 // We may have data ready regardless of whether or not we are finished (e.g. waiting on write)
@@ -827,7 +795,7 @@ bool LLViewerImage::updateFetch()
                 
                 if (!mIsFetching)
                 {
-                        if (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL)
+                        if ((decode_priority > 0) && (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL))
                         {
                                 // We finished but received no data
                                 if (current_discard < 0)
@@ -850,9 +818,9 @@ bool LLViewerImage::updateFetch()
                                 destroyRawImage();
                         }
                 }
-                else if (mDecodePriority >= 0.f)
+                else
                 {
-                        LLAppViewer::getTextureFetch()->updateRequestPriority(mID, mDecodePriority);
+                        LLAppViewer::getTextureFetch()->updateRequestPriority(mID, decode_priority);
                 }
         }
 
@@ -1210,45 +1178,58 @@ void LLViewerImage::setKnownDrawSize(S32 width, S32 height)
 }
 
 // virtual
-BOOL LLViewerImage::bind(S32 stage) const
+bool LLViewerImage::bindError(S32 stage) const
 {
-        if (stage == -1)
+        if (stage < 0) return false;
+        
+        if (gNoRender)
         {
-                return TRUE;
+                return false;
         }
+
+        bool res = true;
         
-        if (gNoRender)
+        // On failure to bind, what should we set the currently bound texture to?
+        if (mIsMissingAsset && !sMissingAssetImagep.isNull() && (this != (LLImageGL *)sMissingAssetImagep))
         {
-                return true;
+                res = gGL.getTexUnit(stage)->bind(sMissingAssetImagep.get());
         }
-        BOOL res = bindTextureInternal(stage);
-        if (res)
+        if (!res && !sDefaultImagep.isNull() && (this != (LLImageGL *)sDefaultImagep))
         {
-                //llassert_always(mIsMissingAsset == FALSE);
-                
+                // use default if we've got it
+                res = gGL.getTexUnit(stage)->bind(sDefaultImagep.get());
         }
-        else
+        if (!res && !sNullImagep.isNull() && (this != (LLImageGL *)sNullImagep))
         {
-                // On failure to bind, what should we set the currently bound texture to?
-                if (mIsMissingAsset && !sMissingAssetImagep.isNull() && (this != (LLImageGL *)sMissingAssetImagep))
-                {
-                        res = sMissingAssetImagep->bind( stage );
-                }
-                if (!res && !sDefaultImagep.isNull() && (this != (LLImageGL *)sDefaultImagep))
-                {
-                        // use default if we've got it
-                        res = sDefaultImagep->bind(stage);
-                }
-                if (!res && !sNullImagep.isNull() && (this != (LLImageGL *)sNullImagep))
-                {
-                        res = sNullImagep->bind(stage);
-                }
-                if (!res)
-                {
-                        llwarns << "LLViewerImage::bindTexture failed." << llendl;
-                }
-                stop_glerror();
+                res = gGL.getTexUnit(stage)->bind(sNullImagep.get());
         }
+        if (!res)
+        {
+                llwarns << "LLViewerImage::bindError failed." << llendl;
+        }
+        stop_glerror();
+        return res;
+}
+
+bool LLViewerImage::bindDefaultImage(S32 stage) const
+{
+        if (stage < 0) return false;
+
+        bool res = true;
+        if (!sDefaultImagep.isNull() && (this != (LLImageGL *)sDefaultImagep))
+        {
+                // use default if we've got it
+                res = gGL.getTexUnit(stage)->bind(sDefaultImagep.get());
+        }
+        if (!res && !sNullImagep.isNull() && (this != (LLImageGL *)sNullImagep))
+        {
+                res = gGL.getTexUnit(stage)->bind(sNullImagep.get());
+        }
+        if (!res)
+        {
+                llwarns << "LLViewerImage::bindError failed." << llendl;
+        }
+        stop_glerror();
         return res;
 }