Merge brad/2549-downrez-controls into release/2024.09-ExtraFPS (#2864)

1 files changed, 48 insertions, 16 deletions

diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index 0b73aa493c..ea95d71b27 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -295,13 +295,20 @@ void LLSnapshotLivePreview::draw()
         gGL.pushMatrix();
         {
             gGL.translatef((F32)rect.mLeft, (F32)rect.mBottom + TOP_PANEL_HEIGHT, 0.f);
-            gGL.begin(LLRender::QUADS);
+            gGL.begin(LLRender::TRIANGLES);
             {
                 gGL.texCoord2f(uv_width, uv_height);
-                gGL.vertex2i(rect.getWidth(), rect.getHeight() );
+                gGL.vertex2i(rect.getWidth(), rect.getHeight());
 
                 gGL.texCoord2f(0.f, uv_height);
-                gGL.vertex2i(0, rect.getHeight() );
+                gGL.vertex2i(0, rect.getHeight());
+
+                gGL.texCoord2f(0.f, 0.f);
+                gGL.vertex2i(0, 0);
+
+
+                gGL.texCoord2f(uv_width, uv_height);
+                gGL.vertex2i(rect.getWidth(), rect.getHeight());
 
                 gGL.texCoord2f(0.f, 0.f);
                 gGL.vertex2i(0, 0);
@@ -357,13 +364,18 @@ void LLSnapshotLivePreview::draw()
                 S32 y2 = gViewerWindow->getWindowHeightScaled() + TOP_PANEL_HEIGHT;
 
                 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-                gGL.begin(LLRender::QUADS);
+                gGL.begin(LLRender::TRIANGLES);
                 {
                     gGL.color4f(1.f, 1.f, 1.f, 0.f);
                     gGL.vertex2i(x1, y1);
                     gGL.vertex2i(x1 + gViewerWindow->getWindowWidthScaled(), y2);
                     gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
                     gGL.vertex2i(x2 + gViewerWindow->getWindowWidthScaled(), y2);
+
+                    gGL.color4f(1.f, 1.f, 1.f, 0.f);
+                    gGL.vertex2i(x1, y1);
+                    gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
+                    gGL.vertex2i(x2 + gViewerWindow->getWindowWidthScaled(), y2);
                     gGL.vertex2i(x2, y1);
 
                     gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
@@ -371,6 +383,11 @@ void LLSnapshotLivePreview::draw()
                     gGL.vertex2i(x2 + gViewerWindow->getWindowWidthScaled(), y2);
                     gGL.color4f(1.f, 1.f, 1.f, 0.f);
                     gGL.vertex2i(x3 + gViewerWindow->getWindowWidthScaled(), y2);
+
+                    gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
+                    gGL.vertex2i(x2, y1);
+                    gGL.color4f(1.f, 1.f, 1.f, 0.f);
+                    gGL.vertex2i(x3 + gViewerWindow->getWindowWidthScaled(), y2);
                     gGL.vertex2i(x3, y1);
                 }
                 gGL.end();
@@ -406,13 +423,19 @@ void LLSnapshotLivePreview::draw()
                 LLRect& rect = mImageRect[old_image_index];
                 gGL.translatef((F32)rect.mLeft, (F32)rect.mBottom - ll_round(getRect().getHeight() * 2.f * (fall_interp * fall_interp)), 0.f);
                 gGL.rotatef(-45.f * fall_interp, 0.f, 0.f, 1.f);
-                gGL.begin(LLRender::QUADS);
+                gGL.begin(LLRender::TRIANGLES);
                 {
                     gGL.texCoord2f(uv_width, uv_height);
-                    gGL.vertex2i(rect.getWidth(), rect.getHeight() );
+                    gGL.vertex2i(rect.getWidth(), rect.getHeight());
 
                     gGL.texCoord2f(0.f, uv_height);
-                    gGL.vertex2i(0, rect.getHeight() );
+                    gGL.vertex2i(0, rect.getHeight());
+
+                    gGL.texCoord2f(0.f, 0.f);
+                    gGL.vertex2i(0, 0);
+
+                    gGL.texCoord2f(uv_width, uv_height);
+                    gGL.vertex2i(rect.getWidth(), rect.getHeight());
 
                     gGL.texCoord2f(0.f, 0.f);
                     gGL.vertex2i(0, 0);
@@ -667,18 +690,25 @@ bool LLSnapshotLivePreview::onIdle( void* snapshot_preview )
         return false;
     }
 
+    static LLCachedControl<bool> auto_snapshot(gSavedSettings, "AutoSnapshot", false);
+    static LLCachedControl<bool> freeze_time(gSavedSettings, "FreezeTime", false);
+    static LLCachedControl<bool> use_freeze_frame(gSavedSettings, "UseFreezeFrame", false);
+    static LLCachedControl<bool> render_ui(gSavedSettings, "RenderUIInSnapshot", false);
+    static LLCachedControl<bool> render_hud(gSavedSettings, "RenderHUDInSnapshot", false);
+    static LLCachedControl<bool> render_no_post(gSavedSettings, "RenderSnapshotNoPost", false);
+
     // If we're in freeze-frame and/or auto update mode and camera has moved, update snapshot.
     LLVector3 new_camera_pos = LLViewerCamera::getInstance()->getOrigin();
     LLQuaternion new_camera_rot = LLViewerCamera::getInstance()->getQuaternion();
     if (previewp->mForceUpdateSnapshot ||
-        (((gSavedSettings.getBOOL("AutoSnapshot") && LLView::isAvailable(previewp->mViewContainer)) ||
-        (gSavedSettings.getBOOL("FreezeTime") && previewp->mAllowFullScreenPreview)) &&
+        (((auto_snapshot && LLView::isAvailable(previewp->mViewContainer)) ||
+        (freeze_time && previewp->mAllowFullScreenPreview)) &&
         (new_camera_pos != previewp->mCameraPos || dot(new_camera_rot, previewp->mCameraRot) < 0.995f)))
     {
         previewp->mCameraPos = new_camera_pos;
         previewp->mCameraRot = new_camera_rot;
         // request a new snapshot whenever the camera moves, with a time delay
-        bool new_snapshot = gSavedSettings.getBOOL("AutoSnapshot") || previewp->mForceUpdateSnapshot;
+        bool new_snapshot = auto_snapshot || previewp->mForceUpdateSnapshot;
         LL_DEBUGS("Snapshot") << "camera moved, updating thumbnail" << LL_ENDL;
         previewp->updateSnapshot(
             new_snapshot, // whether a new snapshot is needed or merely invalidate the existing one
@@ -716,10 +746,10 @@ bool LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                 previewp->getHeight(),
                 previewp->mKeepAspectRatio,//gSavedSettings.getBOOL("KeepAspectForSnapshot"),
                 previewp->getSnapshotType() == LLSnapshotModel::SNAPSHOT_TEXTURE,
-                previewp->mAllowRenderUI && gSavedSettings.getBOOL("RenderUIInSnapshot"),
-                gSavedSettings.getBOOL("RenderHUDInSnapshot"),
+                previewp->mAllowRenderUI && render_ui,
+                render_hud,
                 false,
-                gSavedSettings.getBOOL("RenderSnapshotNoPost"),
+                render_no_post,
                 previewp->mSnapshotBufferType,
                 previewp->getMaxImageSize()))
         {
@@ -731,7 +761,7 @@ bool LLSnapshotLivePreview::onIdle( void* snapshot_preview )
             previewp->estimateDataSize();
 
             // Full size preview is set: get the decoded image result and save it for animation
-            if (gSavedSettings.getBOOL("UseFreezeFrame") && previewp->mAllowFullScreenPreview)
+            if (use_freeze_frame && previewp->mAllowFullScreenPreview)
             {
                 previewp->prepareFreezeFrame();
             }
@@ -744,7 +774,7 @@ bool LLSnapshotLivePreview::onIdle( void* snapshot_preview )
             previewp->generateThumbnailImage(true) ;
         }
         previewp->getWindow()->decBusyCount();
-        previewp->setVisible(gSavedSettings.getBOOL("UseFreezeFrame") && previewp->mAllowFullScreenPreview); // only show fullscreen preview when in freeze frame mode
+        previewp->setVisible(use_freeze_frame && previewp->mAllowFullScreenPreview); // only show fullscreen preview when in freeze frame mode
         previewp->mSnapshotActive = false;
         LL_DEBUGS("Snapshot") << "done creating snapshot" << LL_ENDL;
     }
@@ -864,7 +894,9 @@ LLPointer<LLImageRaw> LLSnapshotLivePreview::getEncodedImage()
         else
         {
             // Update mFormattedImage if necessary
-            getFormattedImage();
+            lock.unlock();
+            getFormattedImage(); // will apply filters to mPreviewImage with a lock
+            lock.lock();
             if (getSnapshotFormat() == LLSnapshotModel::SNAPSHOT_FORMAT_BMP)
             {
                 // BMP hack : copy instead of decode otherwise decode will crash.