105f20b055
FIRE-31326 - Fix crash thread contention crash
...
Crash caused by DD stepping and AutoTune both hacking the RenderFarClip. Added a proxy tunables structure to allow the main thread to tweak the tunables while the work is still done on the perf thread.
2022-01-30 15:48:16 +00:00
f0ca9f9d17
Fix merge error
2021-12-16 09:51:20 +01:00
3322eadea0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-519
2021-11-16 13:04:22 +01:00
ced9423261
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
2021-11-16 12:17:26 +01:00
627eecd577
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 08:22:59 +01:00
0505c6ebbb
Merge branch 'master' into DRTVWR-534
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:21:55 +02:00
b14d460dca
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-11-10 21:21:51 +01:00
6254497151
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-10 21:17:02 +01:00
3ed58d8b63
Fix backgroundyield derp and stop settings reload during autotune
2021-11-10 17:06:00 +00:00
233739879b
Add debug control to disable perfstats
2021-11-05 17:15:27 +00:00
cb1af2dc78
Merge initial perf floater for experimental release
2021-11-04 02:13:49 +00:00
512dc34684
Merge remote-tracking branch 'firestorm-release/master'
2021-11-04 02:09:59 +00:00
8557385707
rationalised changes for stats collection
...
includes additional tracy scopes for testing
most changes are to allow batching stat updates to reduce overhead.
2021-11-03 19:13:12 +00:00
404e69e594
SL-15462 Convert waitForChannel() into state machine
2021-10-28 21:25:38 +03:00
a4a7a765f1
Major refactor and extension of perfdata
...
All data now collated in a separate thread via lock free queue
data for all "self" attachments collected including non-rigged
known issues:
some double counting exists
* in non rigged alpha mask, maybe elsewhere
2021-10-21 13:18:45 +01:00
e8efe2c500
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-15 14:24:05 +02:00
4bdc1843ca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-14 22:50:36 +02:00
8a1bc1b9e2
Merge with head of Master after a new Viewer release
2021-10-13 14:47:06 -07:00
fb170ffe21
Merge branch 'master' into DRTVWR-545-maint-mix
2021-10-14 00:35:08 +03:00
390c136430
Migrate perfstats away from telemetry/profiling
...
perfstats is now a standalone module.
2021-10-13 02:04:05 +01:00
160f44375e
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-10-12 12:59:35 +02:00
35410bdeb6
Perf Floater with auto-FPS
2021-09-25 16:07:45 +01:00
f30cc7b5bb
Revert "SL-11841 make ‘Push to talk’ the default setting"
...
This reverts commits:
126877bc5bb661f62a7ace660c7e7b
2021-09-21 00:20:37 +03:00
7cdd463954
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-09-20 13:16:41 +02:00
7a845ee23b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522
2021-09-20 12:59:14 +02:00
7f1ebf1df8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:24:49 +02:00
4946055f28
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-09-20 11:19:27 +02:00
931fec6d7a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:12:47 +02:00
ce660c7e7b
SL-11841 Fix PushToTalkToggle being set incorectly
...
Due to changed defaults, legacy compatibility will no longer work corectly, remove it
2021-09-18 00:08:27 +03:00
b5b32cc169
more wip perf floater
2021-09-14 12:31:41 +01:00
8b80fa2779
Initial intergation of ART with LL Perf floater
2021-09-06 17:28:30 +01:00
8c7db0ad6c
SL-15902 Cleanup gSecAPIHandler
2021-09-03 22:21:29 +03:00
7fc6519208
DRTVWR-545 Megre fix
2021-09-03 10:49:45 +03:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
efb50dced0
SL-15872 fixed more cases where sUseFBO wasn't updated correctly
2021-09-01 17:42:22 +03:00
e0948b78b1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-31 14:46:36 +02:00
33c20ba190
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-24 14:49:13 +02:00
f6ca6a5fe5
FIRE-31153; avoid nullptr access.
2021-08-13 21:39:04 +02:00
1bfefe7b82
Use correct integer type to avoid overflow in arithmetic expession.
2021-08-13 17:11:10 +02:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-12 23:13:12 +03:00
5776bd5410
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-09 11:10:17 +02:00
1de9a6e32e
SL-15696 Don't be so persistent with outdated driver notification
...
Some manufactures provide no own updated drivers yet forbid users from updating to intel provided one
2021-08-06 20:44:02 +03:00
7ff7317779
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-02 09:35:11 +02:00
4c4dfb682a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 13:35:31 +02:00
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02:00
b388191062
DRTVWR-521 post-merge build fix
2021-07-20 03:02:05 +03:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
738e5c2659
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 19:56:26 +02:00
ec8bef8e9c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/bugsplat.cmake
# indra/newview/llappdelegate-objc.mm
2021-07-06 10:32:52 +02:00
Beq