summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerstats.cpp
AgeCommit message (Collapse)Author
2023-04-26Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539Brad Linden
2023-03-31Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/llfloateravatarrendersettings.cpp
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-20SL-19161 - logging of basic translation stats in ViewerStatsBrad Payne (Vir Linden)
2023-03-10DRTVWR-559 Fix for assert in LLVertexBuffer, incidental decruft.Dave Parks
2022-12-09SL-18824 - added hardare_concurrency to system statsBrad Payne (Vir Linden)
2022-11-28Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559Brad Kittenbrink
2022-11-28Merge remote-tracking branch 'origin/main' into DRTVWR-528Brad Kittenbrink
2022-11-16SL-18154 Profile guided optimizations vs release viewer. Trim some unused ↵Dave Parks
abilities and remove some more fast timers.
2022-11-12SL-18391 Basic gltf material accountingAndrey Kleshchev
Plan is to expand it as needed with overrides, request rate and memory
2022-09-28SL-18248 Move frame breakdown stats to 'Scene loading statistics' floaterMnikolenko Productengine
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-07-12Merge branch 'master' into DRTVWR-528Andrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2022-06-29Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-31SL-17490 Only update a subset of textures each frame and remove dead debug code.Dave Parks
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-26Merge branch 'master' v 6.6.1 into DRTVWR-528Dave Houlton
2022-05-18SL-17388 Add SSE version info to ViewerStatsAndrey Kleshchev
2022-04-26Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
2022-04-18Merge branch 'master' into DRTVWR-528Dave Houlton
2022-03-25Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into SL-17005Dave Parks
2022-03-21SL-17040 Crash when looking for a region by handle or positionAndrey Kleshchev
Might be a better idea to turn LLWorld back into an LLSingleton. Too many things to track.
2022-03-11SL-17005 WIP Simplify what feeds texture loading bias to only pay attention ↵Dave Parks
to available memory according to OS and GL driver, not (broken) internal accounting (breaks intel GPUs, compatibility pass incoming).
2022-03-02Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-01-24SL-16691 Add GPU memory bandwidth to ViewerStatsRunitai Linden
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2022-01-10SL-16605: Remove fallback to Vulkan SDKPtolemy
2022-01-07SL-16605: Report VulkanMaxApiVersion with the appropiate Vulkan 0.0, 1.0, ↵Ptolemy
1.x max API version depending on if we can load the .dll and/or vkEnumerateInstanceVersion.
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-30SL-16386 consolidate all VertexShader capability checks to a single ↵Dave Houlton
LLPipeline::shadersLoaded()
2021-11-19SL-16355 - spammy message removedBrad Payne (Vir Linden)
2021-11-19SL-16329 - track frame time and jitter (as average deviation frame to frame) ↵Brad Payne (Vir Linden)
in stats window
2021-09-07SL-15832 Add OS bitness to ViewerStatsMnikolenko Productengine
2021-06-25Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-04-29SL-15177 Fix the way of counting for gTextureTimerMnikolenko Productengine
2021-03-11Merge branch 'SL-14862' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llviewerstats.cpp
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy