b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
9fef2a114e
Fix timer support on macOS under ARM64
2025-02-11 05:04:09 -05:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
cb3bd8865a
Fix a bunch of uninitialized variable warnings that showed up in Visual Studio
2024-05-30 15:41:36 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
92e53622ea
SL-15709: Cleanup
2021-09-03 17:53:44 -07:00
df5127136f
SL-15709: Add Tracy support to viewer
2021-09-03 17:53:43 -07:00
2bbf8c4fc6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-03-25 18:54:17 +01:00
ac9b87ad1e
Fix comment handling silliness (hopefully)
2021-03-21 19:57:11 +00:00
eb0bfc9e10
more cleanup of telemetry support
...
remove superfluous cmake changes
rename profiler to telemetry to avoid confusion
2021-03-21 14:59:02 +00:00
bd20cfad1d
Ensure clean compile when 3p-Tracy not installed
2021-03-21 14:29:03 +00:00
d640123781
Incorporate Tracy profiler as 3p
2021-03-21 14:29:03 +00:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
7cd076c796
DRTVWR-510 remove all LL_SOLARIS conditionals
2020-10-08 17:16:22 -06:00
16453005bb
[DRTVWR-476] - update cef, fix merge
2020-03-25 18:40:45 -04:00
909cce6f26
Merge with phoenix-firestorm-lgpl
2019-10-31 12:27:30 +01:00
89a6a001fc
Merge viewer-neko
2019-06-17 21:48:11 +02:00
e6e66a953e
Merge with viewer-vs2017
2019-06-06 14:37:27 +02:00
902bfccd02
SL-11231 Unused code and wrong macro
2019-05-28 19:16:34 +03:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
d7a0835432
Merge.
2016-09-26 21:12:34 +02:00
67c401047a
MAINT-5011: Ensure BlockTimer::mStartTime is unconditionally set.
...
Previous logic could possibly leave mStartTime uninitialized, producing fatal
warnings with gcc 4.7.
2016-09-06 20:48:16 -04:00
c87d24ac71
Fasttimers: Windows) Always use the __rdtsc() intrinsic rather than inline assembly. Linux/OSX) The rtdsc assembly intruction is clobbering EAX and EDX, the snippet was not protecting EDX accordingly.
...
(transplanted from 6307b134f821390367d4c86a03b9a492ac7ed282)
2016-04-22 23:59:28 +02:00
056f098302
Windows x64: Cannot use inline assembly.
...
(transplanted from ee32840fc591f5529a0b544243e7b4146eb8f531)
2016-04-22 12:58:51 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
6db8c282f3
Make newer GCC versions happy about unitialized data.
2014-06-11 15:11:06 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
ab43be5ddb
moved some common functionality from LLTrace::BlockTimerStatHandle to BlockTimer
...
updates appearance utility dependency
2013-10-23 13:24:47 -07:00
1beaedacad
moved root timer to global variable
...
added flag to LLInstanceTracker to allow multiple values per key
made StatType allow multiple values per key to eliminate block timer related crash
2013-10-17 14:23:56 -07:00
1c26d42656
moved tree iterators into llfasttimer.h
2013-10-16 16:42:27 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
17df8988fe
renamed TraceType to StatType
...
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -07:00
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
31381e499c
Use __rdtsc intrinsic for x64.
2013-12-15 17:44:38 +01:00
c6b6ae7a45
merge
2013-09-07 21:54:03 -07:00
3fd68662f2
added memory usage and occlusion events to traces
...
renamed "current" to "primary" when referring to accumulators
2013-09-07 21:16:39 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
2c6bc5afa5
SH-4433 WIP Interesting: Statistics > Ping Sim is always 0 ms
...
made getPrimaryAccumulator return a reference since it was an
always non-null pointer
changed unit conversion to perform lazy division in order to avoid truncation
of timer values
2013-08-21 14:06:57 -07:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
26581404e4
BUILDFIX: added header for numeric_limits support on gcc
...
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
2fc422f39d
fixed memory leak due to implementation of LLThreadLocalSingleton
...
removed LLThreadLocalSingleton
collapsed all thread recorder classes to single type, LLTrace::ThreadRecorder
moved fasttimer stack head to llthreadlocalsingletonpointer via ThreadRecorder
2013-06-30 13:32:34 -07:00
808d3eff19
SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics console
...
fixed some lltrace logic errors
more consistent syncing of timestamps of sample values in recording stack
selection of primary buffers was completely incorrect
assignment of recordings got wrong play state due to implicit
operator = defined in base class
fixed asset stats only working up to the first send
2013-06-27 00:07:21 -07:00
c5fc8f9006
SH-4246 FIX interesting: fast timers significantly decreases framerate
...
moved collapsed flag to fast timer tree node
2013-06-19 08:23:53 -07:00
d136c4c296
SH-4246 FIX interesting: fast timers significantly decreases framerate
...
removed implicit flushes on reads from recorders for better performance
made sure stack timers were updated on recorder deactivate
faster rendering and better ui for fast timer view
2013-06-18 23:41:53 -07:00
9fd3af3c38
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed Units macros and argument order to make it more clear
optimized units for integer types
fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13 15:29:15 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Ansariel