diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-11-11 22:45:42 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-11-12 00:19:21 +0200 |
| commit | cdf248d9860246fd0bee84f700642709fdebbe6e (patch) | |
| tree | dbc5d4a4e502b92c7dd34d5947312abd539fc5a5 | |
| parent | 7c677776801385166fe836857ca597a130dbda33 (diff) | |
SL-18391 Basic gltf material accounting
Plan is to expand it as needed with overrides, request rate and memory
| -rw-r--r-- | indra/newview/llgltfmateriallist.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewerstats.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerstats.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_stats.xml | 6 |
4 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index 206be33051..1a059ca9fd 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -37,6 +37,7 @@ #include "llviewercontrol.h" #include "llviewergenericmessage.h" #include "llviewerobjectlist.h" +#include "llviewerstats.h" #include "llcorehttputil.h" #include "llagent.h" @@ -626,6 +627,11 @@ void LLGLTFMaterialList::flushMaterials() { mLastUpdateKey.setNull(); } + + { + using namespace LLStatViewer; + sample(NUM_MATERIALS, mList.size()); + } } // static diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 5d936dfc90..0be9abadbb 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -139,6 +139,7 @@ SimMeasurement<LLUnit<F64, LLUnits::Percent> > LLTrace::SampleStatHandle<> FPS_SAMPLE("fpssample"), NUM_IMAGES("numimagesstat"), NUM_RAW_IMAGES("numrawimagesstat"), + NUM_MATERIALS("nummaterials"), NUM_OBJECTS("numobjectsstat"), NUM_ACTIVE_OBJECTS("numactiveobjectsstat"), ENABLE_VBO("enablevbo", "Vertex Buffers Enabled"), diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h index c21c06256e..4f0f4f8813 100644 --- a/indra/newview/llviewerstats.h +++ b/indra/newview/llviewerstats.h @@ -180,6 +180,7 @@ extern LLTrace::SampleStatHandle<> FPS_SAMPLE, NUM_IMAGES, NUM_RAW_IMAGES, NUM_OBJECTS, + NUM_MATERIALS, NUM_ACTIVE_OBJECTS, ENABLE_VBO, LIGHTING_DETAIL, diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index b9ca0108b6..9ee161e611 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -133,6 +133,12 @@ label="Bound Mem" stat="glboundmemstat"/> </stat_view> + <stat_view name="material" + label="Material"> + <stat_bar name="nummaterials" + label="Count" + stat="nummaterials"/> + </stat_view> <stat_view name="memory" label="Memory Usage"> <stat_bar name="LLTrace" |