summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/app_settings/settings.xml11
-rw-r--r--indra/newview/llfloaterperformance.cpp146
-rw-r--r--indra/newview/llfloaterperformance.h5
-rw-r--r--indra/newview/llperfstats.cpp20
-rw-r--r--indra/newview/llperfstats.h2
-rw-r--r--indra/newview/pipeline.cpp10
-rw-r--r--indra/newview/skins/default/xui/en/panel_performance_nearby.xml24
7 files changed, 125 insertions, 93 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d92632c0a2..b1b971da14 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16820,6 +16820,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>ShowTunedART</key>
+ <map>
+ <key>Comment</key>
+ <string>Show the current render time not the pre-tuning render time in the avatar display.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>RenderAvatarMaxART</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llfloaterperformance.cpp b/indra/newview/llfloaterperformance.cpp
index 257c0b2b37..afa46db1e3 100644
--- a/indra/newview/llfloaterperformance.cpp
+++ b/indra/newview/llfloaterperformance.cpp
@@ -38,6 +38,7 @@
#include "llfloaterreg.h"
#include "llnamelistctrl.h"
#include "llnotificationsutil.h"
+#include "llperfstats.h"
#include "llradiogroup.h"
#include "llsliderctrl.h"
#include "lltextbox.h"
@@ -54,6 +55,11 @@ const S32 BAR_LEFT_PAD = 2;
const S32 BAR_RIGHT_PAD = 5;
const S32 BAR_BOTTOM_PAD = 9;
+constexpr auto AvType {LLPerfStats::ObjType_t::OT_AVATAR};
+constexpr auto AttType {LLPerfStats::ObjType_t::OT_ATTACHMENT};
+constexpr auto HudType {LLPerfStats::ObjType_t::OT_HUD};
+constexpr auto SceneType {LLPerfStats::ObjType_t::OT_GENERAL};
+
class LLExceptionsContextMenu : public LLListContextMenu
{
public:
@@ -87,7 +93,7 @@ LLFloaterPerformance::LLFloaterPerformance(const LLSD& key)
LLFloaterPerformance::~LLFloaterPerformance()
{
- mComplexityChangedSignal.disconnect();
+ mMaxARTChangedSignal.disconnect();
delete mContextMenu;
delete mUpdateTimer;
}
@@ -135,11 +141,15 @@ BOOL LLFloaterPerformance::postBuild()
mNearbyList = mNearbyPanel->getChild<LLNameListCtrl>("nearby_list");
mNearbyList->setRightMouseDownCallback(boost::bind(&LLFloaterPerformance::onAvatarListRightClick, this, _1, _2, _3));
- updateComplexityText();
- mComplexityChangedSignal = gSavedSettings.getControl("RenderAvatarMaxComplexity")->getCommitSignal()->connect(boost::bind(&LLFloaterPerformance::updateComplexityText, this));
- mNearbyPanel->getChild<LLSliderCtrl>("IndirectMaxComplexity")->setCommitCallback(boost::bind(&LLFloaterPerformance::updateMaxComplexity, this));
+ mMaxARTChangedSignal = gSavedSettings.getControl("RenderAvatarMaxART")->getCommitSignal()->connect(boost::bind(&LLFloaterPerformance::updateMaxRenderTime, this));
+ mNearbyPanel->getChild<LLSliderCtrl>("RenderAvatarMaxART")->setCommitCallback(boost::bind(&LLFloaterPerformance::updateMaxRenderTime, this));
- LLAvatarComplexityControls::setIndirectMaxArc();
+ // store the current setting as the users desired reflection detail and DD
+ gSavedSettings.setS32("UserTargetReflections", LLPipeline::RenderReflectionDetail);
+ if(!LLPerfStats::tunables.userAutoTuneEnabled)
+ {
+ gSavedSettings.setF32("AutoTuneRenderFarClipTarget", LLPipeline::RenderFarClip);
+ }
return TRUE;
}
@@ -224,16 +234,13 @@ void LLFloaterPerformance::populateHUDList()
hud_complexity_list_t::iterator iter = complexity_list.begin();
hud_complexity_list_t::iterator end = complexity_list.end();
- U32 max_complexity = 0;
- for (; iter != end; ++iter)
- {
- max_complexity = llmax(max_complexity, (*iter).objectsCost);
- }
-
+ auto huds_max_render_time_raw = LLPerfStats::StatsRecorder::getMax(HudType, LLPerfStats::StatType_t::RENDER_GEOMETRY);
for (iter = complexity_list.begin(); iter != end; ++iter)
{
- LLHUDComplexity hud_object_complexity = *iter;
- S32 obj_cost_short = llmax((S32)hud_object_complexity.objectsCost / 1000, 1);
+ LLHUDComplexity hud_object_complexity = *iter;
+
+ auto hud_render_time_raw = LLPerfStats::StatsRecorder::get(HudType, hud_object_complexity.objectId, LLPerfStats::StatType_t::RENDER_GEOMETRY);
+
LLSD item;
item["special_id"] = hud_object_complexity.objectId;
item["target"] = LLNameListCtrl::SPECIAL;
@@ -241,14 +248,14 @@ void LLFloaterPerformance::populateHUDList()
row[0]["column"] = "complex_visual";
row[0]["type"] = "bar";
LLSD& value = row[0]["value"];
- value["ratio"] = (F32)obj_cost_short / max_complexity * 1000;
+ value["ratio"] = (F32)hud_render_time_raw / huds_max_render_time_raw;
value["bottom"] = BAR_BOTTOM_PAD;
value["left_pad"] = BAR_LEFT_PAD;
value["right_pad"] = BAR_RIGHT_PAD;
row[1]["column"] = "complex_value";
row[1]["type"] = "text";
- row[1]["value"] = std::to_string(obj_cost_short);
+ row[1]["value"] = llformat( "%.f",LLPerfStats::raw_to_us(hud_render_time_raw) );
row[1]["font"]["name"] = "SANSSERIF";
row[2]["column"] = "name";
@@ -283,45 +290,46 @@ void LLFloaterPerformance::populateObjectList()
object_complexity_list_t::iterator iter = complexity_list.begin();
object_complexity_list_t::iterator end = complexity_list.end();
- U32 max_complexity = 0;
- for (; iter != end; ++iter)
+ // for consistency we lock the buffer while we build the list. In theory this is uncontended as the buffer should only toggle on end of frame
{
- max_complexity = llmax(max_complexity, (*iter).objectCost);
- }
+ std::lock_guard<std::mutex> guard{ LLPerfStats::bufferToggleLock };
+ auto att_max_render_time_raw = LLPerfStats::StatsRecorder::getMax(AttType, LLPerfStats::StatType_t::RENDER_COMBINED);
- for (iter = complexity_list.begin(); iter != end; ++iter)
- {
- LLObjectComplexity object_complexity = *iter;
- S32 obj_cost_short = llmax((S32)object_complexity.objectCost / 1000, 1);
- LLSD item;
- item["special_id"] = object_complexity.objectId;
- item["target"] = LLNameListCtrl::SPECIAL;
- LLSD& row = item["columns"];
- row[0]["column"] = "complex_visual";
- row[0]["type"] = "bar";
- LLSD& value = row[0]["value"];
- value["ratio"] = (F32)obj_cost_short / max_complexity * 1000;
- value["bottom"] = BAR_BOTTOM_PAD;
- value["left_pad"] = BAR_LEFT_PAD;
- value["right_pad"] = BAR_RIGHT_PAD;
+ for (iter = complexity_list.begin(); iter != end; ++iter)
+ {
+ LLObjectComplexity object_complexity = *iter;
- row[1]["column"] = "complex_value";
- row[1]["type"] = "text";
- row[1]["value"] = std::to_string(obj_cost_short);
- row[1]["font"]["name"] = "SANSSERIF";
+ auto attach_render_time_raw = LLPerfStats::StatsRecorder::get(AttType, object_complexity.objectId, LLPerfStats::StatType_t::RENDER_COMBINED);
+ LLSD item;
+ item["special_id"] = object_complexity.objectId;
+ item["target"] = LLNameListCtrl::SPECIAL;
+ LLSD& row = item["columns"];
+ row[0]["column"] = "complex_visual";
+ row[0]["type"] = "bar";
+ LLSD& value = row[0]["value"];
+ value["ratio"] = ((F32)attach_render_time_raw) / att_max_render_time_raw;
+ value["bottom"] = BAR_BOTTOM_PAD;
+ value["left_pad"] = BAR_LEFT_PAD;
+ value["right_pad"] = BAR_RIGHT_PAD;
- row[2]["column"] = "name";
- row[2]["type"] = "text";
- row[2]["value"] = object_complexity.objectName;
- row[2]["font"]["name"] = "SANSSERIF";
+ row[1]["column"] = "complex_value";
+ row[1]["type"] = "text";
+ row[1]["value"] = llformat("%.f", LLPerfStats::raw_to_us(attach_render_time_raw));
+ row[1]["font"]["name"] = "SANSSERIF";
- LLScrollListItem* obj = mObjectList->addElement(item);
- if (obj)
- {
- LLScrollListText* value_text = dynamic_cast<LLScrollListText*>(obj->getColumn(1));
- if (value_text)
+ row[2]["column"] = "name";
+ row[2]["type"] = "text";
+ row[2]["value"] = object_complexity.objectName;
+ row[2]["font"]["name"] = "SANSSERIF";
+
+ LLScrollListItem* obj = mObjectList->addElement(item);
+ if (obj)
{
- value_text->setAlignment(LLFontGL::HCENTER);
+ LLScrollListText* value_text = dynamic_cast<LLScrollListText*>(obj->getColumn(1));
+ if (value_text)
+ {
+ value_text->setAlignment(LLFontGL::HCENTER);
+ }
}
}
}
@@ -332,6 +340,7 @@ void LLFloaterPerformance::populateObjectList()
void LLFloaterPerformance::populateNearbyList()
{
+ static LLCachedControl<bool> showTunedART(gSavedSettings, "ShowTunedART");
S32 prev_pos = mNearbyList->getScrollPos();
LLUUID prev_selected_id = mNearbyList->getStringUUIDSelectedItem();
mNearbyList->clearRows();
@@ -342,26 +351,44 @@ void LLFloaterPerformance::populateNearbyList()
mNearbyMaxComplexity = LLWorld::getInstance()->getNearbyAvatarsAndCompl(valid_nearby_avs);
std::vector<LLCharacter*>::iterator char_iter = valid_nearby_avs.begin();
+
+ LLPerfStats::bufferToggleLock.lock();
+ auto av_render_max_raw = LLPerfStats::StatsRecorder::getMax(AvType, LLPerfStats::StatType_t::RENDER_COMBINED);
+ LLPerfStats::bufferToggleLock.unlock();
+
while (char_iter != valid_nearby_avs.end())
{
LLVOAvatar* avatar = dynamic_cast<LLVOAvatar*>(*char_iter);
if (avatar && (LLVOAvatar::AOA_INVISIBLE != avatar->getOverallAppearance()))
{
- S32 complexity_short = llmax((S32)avatar->getVisualComplexity() / 1000, 1);;
+ LLPerfStats::bufferToggleLock.lock();
+ auto render_av_raw = LLPerfStats::StatsRecorder::get(AvType, avatar->getID(),LLPerfStats::StatType_t::RENDER_COMBINED);
+ LLPerfStats::bufferToggleLock.unlock();
+
+ auto is_slow = avatar->isTooSlowWithShadows();
LLSD item;
item["id"] = avatar->getID();
LLSD& row = item["columns"];
row[0]["column"] = "complex_visual";
row[0]["type"] = "bar";
LLSD& value = row[0]["value"];
- value["ratio"] = (F32)complexity_short / mNearbyMaxComplexity * 1000;
+ // The ratio used in the bar is the current cost, as soon as we take action this changes so we keep the
+ // pre-tune value for the numerical column and sorting.
+ value["ratio"] = (double)render_av_raw / av_render_max_raw;
value["bottom"] = BAR_BOTTOM_PAD;
value["left_pad"] = BAR_LEFT_PAD;
value["right_pad"] = BAR_RIGHT_PAD;
row[1]["column"] = "complex_value";
row[1]["type"] = "text";
- row[1]["value"] = std::to_string(complexity_short);
+ if (is_slow && !showTunedART)
+ {
+ row[1]["value"] = llformat( "%.f", LLPerfStats::raw_to_us( avatar->getLastART() ) );
+ }
+ else
+ {
+ row[1]["value"] = llformat( "%.f", LLPerfStats::raw_to_us( render_av_raw ) );
+ }
row[1]["font"]["name"] = "SANSSERIF";
row[2]["column"] = "name";
@@ -387,7 +414,7 @@ void LLFloaterPerformance::populateNearbyList()
else
{
std::string color = "white";
- if (LLVOAvatar::AOA_JELLYDOLL == avatar->getOverallAppearance())
+ if (is_slow || LLVOAvatar::AOA_JELLYDOLL == avatar->getOverallAppearance())
{
color = "LabelDisabledColor";
LLScrollListBar* bar = dynamic_cast<LLScrollListBar*>(av_item->getColumn(0));
@@ -462,18 +489,11 @@ void LLFloaterPerformance::onClickExceptions()
LLFloaterReg::showInstance("avatar_render_settings");
}
-void LLFloaterPerformance::updateMaxComplexity()
-{
- LLAvatarComplexityControls::updateMax(
- mNearbyPanel->getChild<LLSliderCtrl>("IndirectMaxComplexity"),
- mNearbyPanel->getChild<LLTextBox>("IndirectMaxComplexityText"),
- true);
-}
-
-void LLFloaterPerformance::updateComplexityText()
+void LLFloaterPerformance::updateMaxRenderTime()
{
- LLAvatarComplexityControls::setText(gSavedSettings.getU32("RenderAvatarMaxComplexity"),
- mNearbyPanel->getChild<LLTextBox>("IndirectMaxComplexityText", true),
+ LLAvatarComplexityControls::updateMaxRenderTime(
+ mNearbyPanel->getChild<LLSliderCtrl>("RenderAvatarMaxART"),
+ mNearbyPanel->getChild<LLTextBox>("RenderAvatarMaxARTText"),
true);
}
diff --git a/indra/newview/llfloaterperformance.h b/indra/newview/llfloaterperformance.h
index 01b65365da..a79da7460b 100644
--- a/indra/newview/llfloaterperformance.h
+++ b/indra/newview/llfloaterperformance.h
@@ -66,8 +66,7 @@ private:
void onClickShadows();
void onClickAdvancedLighting();
- void updateMaxComplexity();
- void updateComplexityText();
+ void updateMaxRenderTime();
static void changeQualityLevel(const std::string& notif);
@@ -87,7 +86,7 @@ private:
S32 mNearbyMaxComplexity;
- boost::signals2::connection mComplexityChangedSignal;
+ boost::signals2::connection mMaxARTChangedSignal;
};
#endif // LL_LLFLOATERPERFORMANCE_H
diff --git a/indra/newview/llperfstats.cpp b/indra/newview/llperfstats.cpp
index 16d0df0245..1a0e5842e2 100644
--- a/indra/newview/llperfstats.cpp
+++ b/indra/newview/llperfstats.cpp
@@ -76,15 +76,15 @@ namespace LLPerfStats
void Tunables::updateRenderCostLimitFromSettings()
{
assert_main_thread();
- const auto newval = gSavedSettings.getF32("RenderAvatarMaxART");
- if(newval < log10(LLPerfStats::ART_UNLIMITED_NANOS/1000))
- {
- LLPerfStats::renderAvatarMaxART_ns = pow(10,newval)*1000;
- }
- else
- {
- LLPerfStats::renderAvatarMaxART_ns = 0;
- };
+ const auto newval = gSavedSettings.getF32("RenderAvatarMaxART");
+ if(newval < log10(LLPerfStats::ART_UNLIMITED_NANOS/1000))
+ {
+ LLPerfStats::renderAvatarMaxART_ns = pow(10,newval)*1000;
+ }
+ else
+ {
+ LLPerfStats::renderAvatarMaxART_ns = 0;
+ }
}
// static
@@ -466,4 +466,4 @@ namespace LLPerfStats
}
}
}
-} \ No newline at end of file
+}
diff --git a/indra/newview/llperfstats.h b/indra/newview/llperfstats.h
index 1e867f5ef1..961594f18c 100644
--- a/indra/newview/llperfstats.h
+++ b/indra/newview/llperfstats.h
@@ -451,4 +451,4 @@ static inline void trackAttachments(const T * vobj, bool isRigged, RATptr* ratPt
return;
};
-#endif \ No newline at end of file
+#endif
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 7044d27430..2a059e5db4 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -10853,10 +10853,12 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar, bool preview_avatar)
<< " is " << ( too_complex ? "" : "not ") << "too complex"
<< LL_ENDL;
- pushRenderTypeMask();
-
- if (visually_muted || too_complex)
- {
+ bool too_slow = avatar->isTooSlowWithoutShadows(); // only if we really have to do we imposter.
+
+ pushRenderTypeMask();
+
+ if ( !too_slow && ( visually_muted || too_complex ) )
+ {
// only show jelly doll geometry
andRenderTypeMask(LLPipeline::RENDER_TYPE_AVATAR,
LLPipeline::RENDER_TYPE_CONTROL_AV,
diff --git a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
index e1aef13717..e80bf592e4 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml
@@ -57,22 +57,22 @@
Hide the most complex avatars to boost speed.
</text>
<slider
- control_name="IndirectMaxComplexity"
- tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
+ control_name="RenderAvatarMaxART"
+ tool_tip="Controls when a visually complex avatar is considered to be taking too long to render (unit: microseconds)"
follows="left|top"
height="16"
- initial_value="101"
- increment="1"
- label="Maximum complexity (K)"
+ initial_value="4.7"
+ increment="0.01"
+ label="Maximum render time (μs)"
text_color="White"
label_width="165"
layout="topleft"
- min_val="1"
- max_val="101"
- name="IndirectMaxComplexity"
+ min_val="2"
+ max_val="4.7"
+ name="RenderAvatarMaxART"
show_text="false"
top_pad="10"
- width="300">
+ width="490">
</slider>
<text
type="string"
@@ -81,11 +81,11 @@
height="16"
layout="topleft"
top_delta="0"
- left_delta="304"
+ left_pad="5"
text_color="White"
- name="IndirectMaxComplexityText"
+ name="RenderAvatarMaxARTText"
width="65">
- 0
+ no limit
</text>
<name_list
column_padding="0"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 04:59:12 +0000