2a10bd406c
DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().
...
The trouble with debugLoggingEnabled() is that it locked mutexes and searched
maps every time that call was reached. LL_DEBUGS() has the same functionality
(albeit with idiosyncratic syntax) but performs expensive lookups only once
per session, caching the result in a local static variable.
2023-05-03 09:55:31 -04:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
41d24952ff
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
2023-03-31 17:17:21 +03:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
72cec2d347
SL-19161 - logging of basic translation stats in ViewerStats
2023-03-20 22:39:48 +02:00
bd4b03de8b
DRTVWR-559 Fix for assert in LLVertexBuffer, incidental decruft.
2023-03-10 13:33:36 -06:00
4a554bfded
SL-18824 - added hardare_concurrency to system stats
2022-12-09 15:02:26 +00:00
a887c486b4
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
2022-11-28 16:24:53 -08:00
0b188ac04e
Merge remote-tracking branch 'origin/main' into DRTVWR-528
2022-11-28 14:33:27 -08:00
8d2ac419b2
SL-18154 Profile guided optimizations vs release viewer. Trim some unused abilities and remove some more fast timers.
2022-11-16 14:49:17 -06:00
cdf248d986
SL-18391 Basic gltf material accounting
...
Plan is to expand it as needed with overrides, request rate and memory
2022-11-12 00:19:21 +02:00
198420f9f6
SL-18248 Move frame breakdown stats to 'Scene loading statistics' floater
2022-09-28 14:16:16 +03:00
85504f085e
Merge branch 'master' into DRTVWR-539
2022-09-21 18:36:49 +03:00
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
43de9f202e
Merge branch 'master' into DRTVWR-528
...
# Conflicts:
# indra/newview/llappviewer.cpp
2022-07-12 00:42:54 +03:00
b0e9840648
Merge branch 'master' into DRTVWR-539
2022-06-29 21:03:15 +03:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
dfa71e2bb5
SL-17490 Only update a subset of textures each frame and remove dead debug code.
2022-05-31 11:57:15 -05:00
9b0569840f
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# 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-27 02:51:33 +03:00
02c71b0ac2
Merge branch 'master' v 6.6.1 into DRTVWR-528
2022-05-26 11:18:44 -06:00
ed74d15246
SL-17388 Add SSE version info to ViewerStats
2022-05-18 01:27:25 +03:00
79c9a8a4b7
Merge branch 'DRTVWR-546' into DRTVWR-539
2022-04-26 16:03:03 +03:00
035b1996df
Merge branch 'master' into DRTVWR-528
2022-04-18 15:35:23 -06:00
180989f28e
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into SL-17005
2022-03-25 13:21:10 -05:00
1d79d101ec
SL-17040 Crash when looking for a region by handle or position
...
Might be a better idea to turn LLWorld back into an LLSingleton. Too many things to track.
2022-03-21 21:14:20 +02:00
34e79c8f4e
SL-17005 WIP Simplify what feeds texture loading bias to only pay attention to available memory according to OS and GL driver, not (broken) internal accounting (breaks intel GPUs, compatibility pass incoming).
2022-03-11 10:21:08 -06:00
0aaf5284dc
Merge branch 'master' into DRTVWR-539
...
# 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-02 00:46:10 +02:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# 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-01 13:41:42 +02:00
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
9c7ec66d24
SL-16691 Add GPU memory bandwidth to ViewerStats
2022-01-24 11:04:11 -06:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
fe4f09e033
SL-16605: Remove fallback to Vulkan SDK
2022-01-10 13:36:02 -08:00
b24c0a6ba2
SL-16605: Report VulkanMaxApiVersion with the appropiate Vulkan 0.0, 1.0, 1.x max API version depending on if we can load the .dll and/or vkEnumerateInstanceVersion.
2022-01-07 17:57:39 -08:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
7a5ef999d0
SL-16386 consolidate all VertexShader capability checks to a single LLPipeline::shadersLoaded()
2021-11-30 17:04:35 -07:00
0d4c6ee572
SL-16355 - spammy message removed
2021-11-19 14:43:19 -05:00
730b8427b5
SL-16329 - track frame time and jitter (as average deviation frame to frame) in stats window
2021-11-19 14:43:19 -05:00
c82995f3e6
SL-15832 Add OS bitness to ViewerStats
2021-09-07 18:46:40 +03:00
8b5fe507a4
Merge branch 'master' into DRTVWR-530-maint
2021-06-25 01:02:15 +03:00
57da3e609f
Merge branch 'master' into DRTVWR-519
2021-06-24 14:35:24 -07:00
c8977fd904
SL-15177 Fix the way of counting for gTextureTimer
2021-04-29 17:38:15 +03:00
d79617dd27
Merge branch 'SL-14862' into DRTVWR-527-maint
...
# Conflicts:
# indra/newview/llviewerstats.cpp
2021-03-11 18:43:03 +02:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and 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-09 14:39:51 -08:00
2265efdaf3
Merge branch 'master' into DRTVWR-527-maint
2021-03-09 22:00:33 +02:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
Nat Goodspeed