Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus

1 files changed, 37 insertions, 29 deletions

diff --git a/indra/newview/llheroprobemanager.cpp b/indra/newview/llheroprobemanager.cpp
index efe72128d4..66ccdd2b32 100644
--- a/indra/newview/llheroprobemanager.cpp
+++ b/indra/newview/llheroprobemanager.cpp
@@ -42,8 +42,8 @@
 #include "llviewerjoystick.h"
 #include "llviewermediafocus.h"
 
-extern BOOL gCubeSnapshot;
-extern BOOL gTeleportDisplay;
+extern bool gCubeSnapshot;
+extern bool gTeleportDisplay;
 
 // get the next highest power of two of v (or v if v is already a power of two)
 //defined in llvertexbuffer.cpp
@@ -101,7 +101,7 @@ void LLHeroProbeManager::update()
         U32 count = log2((F32)res) + 0.5f;
 
         mMipChain.resize(count);
-        for (int i = 0; i < count; ++i)
+        for (U32 i = 0; i < count; ++i)
         {
             mMipChain[i].allocate(res, res, GL_RGBA16F);
             res /= 2;
@@ -188,18 +188,8 @@ void LLHeroProbeManager::update()
                 LLVector3(0, 0, -1)
             };
 
-            // Iterate through each face of the cube
-            for (int i = 0; i < 6; i++)
-            {
-                float cube_facing = fmax(-1, fmin(1.0f, cameraDirection * cubeFaces[i]));
-
-                cube_facing = 1 - cube_facing;
-
-                mFaceUpdateList[i] = ceilf(cube_facing * gPipeline.RenderHeroProbeConservativeUpdateMultiplier);
-            }
-
-            
             mProbes[0]->mOrigin = probe_pos;
+            mProbes[0]->mRadius = mNearestHero->getScale().magVec() * 0.5f;
         }
         else
         {
@@ -208,7 +198,7 @@ void LLHeroProbeManager::update()
 
         mHeroProbeStrength = 1;
     }
-}
+    }
 
 void LLHeroProbeManager::renderProbes()
 {
@@ -220,9 +210,10 @@ void LLHeroProbeManager::renderProbes()
 
     static LLCachedControl<S32> sDetail(gSavedSettings, "RenderHeroReflectionProbeDetail", -1);
     static LLCachedControl<S32> sLevel(gSavedSettings, "RenderHeroReflectionProbeLevel", 3);
+    static LLCachedControl<S32> sUpdateRate(gSavedSettings, "RenderHeroProbeUpdateRate", 0);
 
     F32 near_clip = 0.01f;
-    if (mNearestHero != nullptr && (gPipeline.RenderHeroProbeUpdateRate == 0 || (gFrameCount % gPipeline.RenderHeroProbeUpdateRate) == 0) &&
+    if (mNearestHero != nullptr &&
         !gTeleportDisplay && !gDisconnected && !LLAppViewer::instance()->logoutRequestSent())
     {
         LL_PROFILE_ZONE_NAMED_CATEGORY_DISPLAY("hpmu - realtime");
@@ -230,22 +221,38 @@ void LLHeroProbeManager::renderProbes()
         bool radiance_pass = gPipeline.mReflectionMapManager.isRadiancePass();
 
         gPipeline.mReflectionMapManager.mRadiancePass = true;
-        mRenderingMirror                              = true;
+        mRenderingMirror = true;
+
+        S32 rate = sUpdateRate;
+
+        // rate must be divisor of 6 (1, 2, 3, or 6)
+        if (rate < 1)
+        {
+            rate = 1;
+        }
+        else if (rate > 3)
+        {
+            rate = 6;
+        }
 
-        doOcclusion();
+        S32 face = gFrameCount % 6;
 
-        for (U32 j = 0; j < mProbes.size(); j++)
+        if (!mProbes.empty() && !mProbes[0].isNull() && !mProbes[0]->mOccluded)
         {
+            LL_PROFILE_ZONE_NUM(gFrameCount % rate);
+            LL_PROFILE_ZONE_NUM(rate);
+
             for (U32 i = 0; i < 6; ++i)
             {
-                if (mFaceUpdateList[i] > 0 && mCurrentProbeUpdateFrame % mFaceUpdateList[i] == 0)
-                {
-                    updateProbeFace(mProbes[j], i, mNearestHero->getReflectionProbeIsDynamic() && sDetail > 0, near_clip);
-                    mCurrentProbeUpdateFrame = 0;
+                if ((gFrameCount % rate) == (i % rate))
+                { // update 6/rate faces per frame
+                    LL_PROFILE_ZONE_NUM(i);
+                    updateProbeFace(mProbes[0], i, mNearestHero->getReflectionProbeIsDynamic() && sDetail > 0, near_clip);
                 }
             }
-            generateRadiance(mProbes[j]);
+            generateRadiance(mProbes[0]);
         }
+
         mRenderingMirror = false;
 
         gPipeline.mReflectionMapManager.mRadiancePass = radiance_pass;
@@ -253,8 +260,6 @@ void LLHeroProbeManager::renderProbes()
         mProbes[0]->mViewerObject = mNearestHero;
         mProbes[0]->autoAdjustOrigin();
     }
-
-    mCurrentProbeUpdateFrame++;
 }
 
 // Do the reflection map update render passes.
@@ -359,7 +364,8 @@ void LLHeroProbeManager::updateProbeFace(LLReflectionMap* probe, U32 face, bool
 
             res /= 2;
 
-            S32 mip = i - (mMipChain.size() - mips);
+            llassert(mMipChain.size() <= size_t(S32_MAX));
+            GLint mip = i - (S32(mMipChain.size()) - mips);
 
             if (mip >= 0)
             {
@@ -387,6 +393,7 @@ void LLHeroProbeManager::updateProbeFace(LLReflectionMap* probe, U32 face, bool
 // Useful when we may not always be rendering a full set of faces of the probe.
 void LLHeroProbeManager::generateRadiance(LLReflectionMap* probe)
 {
+    LL_PROFILE_ZONE_SCOPED_CATEGORY_DISPLAY;
     S32 sourceIdx = mReflectionProbeCount;
 
     // Unlike the reflectionmap manager, all probes are considered "realtime" for hero probes.
@@ -487,7 +494,8 @@ void LLHeroProbeManager::updateUniforms()
         mHeroData.heroSphere.mV[3] = mProbes[0]->mRadius;
     }
 
-    mHeroData.heroMipCount = mMipChain.size();
+    llassert(mMipChain.size() <= size_t(S32_MAX));
+    mHeroData.heroMipCount = S32(mMipChain.size());
 }
 
 void LLHeroProbeManager::renderDebug()
@@ -592,7 +600,7 @@ void LLHeroProbeManager::doOcclusion()
 
     for (auto& probe : mProbes)
     {
-        if (probe != nullptr && probe != mDefaultProbe)
+        if (probe != nullptr)
         {
             probe->doOcclusion(eye);
         }