Get things working a little more consistently between BP and PBR. Also add some bias controls for the texel-to-pixel ratio based streaming.

2 files changed, 0 insertions, 27 deletions

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 5296e86a69..2b0f989701 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -356,7 +356,6 @@ S32 LLTextureEntry::setScale(F32 s, F32 t)
     {
         mScaleS = s;
         mScaleT = t;
-        mMinScaleSq = -1.f;  // invalidate cache for getMinScaleSq()
 
         retval = TEM_CHANGE_TEXTURE;
     }
@@ -369,7 +368,6 @@ S32 LLTextureEntry::setScaleS(F32 s)
     if (mScaleS != s)
     {
         mScaleS = s;
-        mMinScaleSq = -1.f;  // invalidate cache for getMinScaleSq()
         retval = TEM_CHANGE_TEXTURE;
     }
     return retval;
@@ -381,22 +379,11 @@ S32 LLTextureEntry::setScaleT(F32 t)
     if (mScaleT != t)
     {
         mScaleT = t;
-        mMinScaleSq = -1.f;  // invalidate cache for getMinScaleSq()
         retval = TEM_CHANGE_TEXTURE;
     }
     return retval;
 }
 
-F32 LLTextureEntry::getMinScaleSq() const
-{
-    if (mMinScaleSq < 0.f)
-    {
-        F32 m = llmin(fabsf(mScaleS), fabsf(mScaleT));
-        mMinScaleSq = m * m;
-    }
-    return mMinScaleSq;
-}
-
 S32 LLTextureEntry::setColor(const LLColor4 &color)
 {
     if (mColor != color)
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index 765a5f5fdc..78c61b4d65 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -143,13 +143,6 @@ public:
     F32  getScaleS() const { return mScaleS; }
     F32  getScaleT() const { return mScaleT; }
 
-    // Cached min(|mScaleS|, |mScaleT|)^2, lazily computed and invalidated
-    // in setScale/setScaleS/setScaleT. Used by the texture streaming face
-    // loop (updateImageDecodePriority) to avoid the per-face per-frame
-    // sqrt/abs/min/multiply chain. Returns the raw (unclamped) value;
-    // callers still apply TextureScaleMin/MaxAreaFactor clamps.
-    F32  getMinScaleSq() const;
-
     void getOffset(F32 *s, F32 *t) const { *s = mOffsetS; *t = mOffsetT; }
     F32  getOffsetS() const { return mOffsetS; }
     F32  getOffsetT() const { return mOffsetT; }
@@ -225,13 +218,6 @@ public:
     F32                 mOffsetT;               // S, T offset
     F32                 mRotation;              // anti-clockwise rotation in rad about the bottom left corner
 
-private:
-    // Cache for getMinScaleSq(). -1.f sentinel = stale. Invalidated by
-    // setScale/setScaleS/setScaleT. Mutable so getMinScaleSq() can fill it
-    // on first read without breaking const correctness for read-only callers.
-    mutable F32 mMinScaleSq = -1.f;
-public:
-
     static const LLTextureEntry null;
 
     // LLSD key defines