c83e664148
SL-18869 GL 3 compatibility pass and minor decruft.
2023-01-20 13:00:40 -06:00
b4fde14f09
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-01-19 23:04:50 +01:00
7bd9d21e19
Optimizations, decruft, and intel compatibility pass ( #53 )
...
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19 09:13:45 -06:00
75180c8746
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llglslshader.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2023-01-12 12:08:46 +01:00
a2d17d3c1e
SL-18869 Optimizations -- Decruftify LLRenderTarget, use a shader to copy color/depth instead of glCopyTexSubImage or glBlitFrameBuffer
2023-01-09 18:12:54 -06:00
0ae0cd0c88
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-24 20:01:04 +02:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
5763aa32cc
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llsettingsvo.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
2022-10-12 16:25:18 +02:00
b6e576c7c2
SL-18190 Cleanup -- convert some vec4's to vec3's (as they really are), remove some unused glsl files.
2022-10-11 20:20:39 -05:00
c3eb62664b
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyV.glsl
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llpanelface.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-09-26 15:21:07 +02:00
e5d463ca20
SL-17705 Backwards compatibility pass. Support OpenGL pre-4.0 by disabling reflection probes and anti-aliasing. Get render parity with current release viewer when reflection probes are disabled.
2022-09-22 17:27:18 -05:00
9756e0e89e
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldynamictexture.cpp
# indra/newview/llface.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerwindow.cpp
2022-09-17 12:02:14 +02:00
8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
1f176fdc18
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
2022-09-13 20:11:44 +02:00
c9565d6493
SL-17967 - remove some debug/devel code
2022-09-06 14:45:44 -07:00
60cc58fbfc
SL-17967 Fix for confounding program and shader objects when fetching logs and fix for gl errors on AMD windows
2022-09-02 21:05:53 -05:00
00b1fec960
SL-17967 Purge OpenGL extensions (use core API only)
2022-09-02 19:53:56 -05:00
01d03edd85
SL-17967 - _ARB constant removal
2022-09-01 13:38:22 -07:00
2082443220
SL-17967 - Git rid of ARB that is in core
2022-09-01 10:58:27 -07:00
6fbc733c97
SL-17967 - demonstrate what features are provided in various profiles
2022-08-29 18:00:43 -07:00
509cfcad31
experiments for turning on opengl core profile on mac for DRTVWR-559
2022-08-26 09:30:01 -07:00
abf0d2e92b
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llvovolume.cpp
2022-06-29 23:11:18 +02:00
adfc89c831
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 23:08:37 +02:00
2c0edbac18
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 22:04:20 +02:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
536e958018
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llface.cpp
# indra/newview/llfilepicker.h
# indra/newview/llinventoryicon.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
2022-06-27 17:58:22 +02:00
c13e204474
WIP adding check for existence of ARB_texture_cube_map_array extension
2022-06-23 22:53:55 -07:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
4eef3f7877
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-05-27 23:09:50 +02:00
a426e8ddb3
DRTVWR-543 post-merge cleanup
2022-05-27 19:05:14 +03:00
e5c7fd4fff
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llrender/llgl.cpp
# indra/newview/llface.cpp
# indra/newview/llvovolume.cpp
2022-05-27 12:55:19 +02:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# 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 11:41:45 +02: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
3765c775cb
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-05-21 15:04:54 +02:00
b2141e9446
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559
2022-05-16 12:26:17 -05:00
3400e5fd30
SL-17284 Reflection probe tuning and optimization take 1
2022-05-16 17:21:08 +00:00
410704b5c6
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-03 11:37:50 +02:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
c184c882c6
SL-17035 Reverted a part of previous commit
...
According to davep, the intent of Debug GL is to crash and in this it's doing it's job, but the rest of the fix that makes the state not persist is a good solution.
2022-04-15 00:13:36 +03:00
e5cd4da823
SL-17035 Crash at gl_debug_callback
...
RenderDebugGL was avaliable from develop menu, but since it was persistent, caused slowdowns and crashes it could result in users crashing or lagging without knowing the cause. To resolve the issue it was made to last for a single session.
2022-04-14 22:26:58 +03:00
8c2deb6f8d
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/lltracker.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2022-02-22 14:52:56 +01:00
0d6aa3c0fe
SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory.
2022-02-17 22:52:23 +00:00
e7bc3f3a5a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-02-16 10:54:59 +01:00
f47730b92c
SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-14 18:07:24 +00:00
c38812aa15
SL-16727: Revert change causing llvieweroctree to not render reflections when shadows are set to projectors cause by commit bb379cb8cc
2022-02-03 11:11:46 -08:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
206a8bb30f
SL-16606: Add profiler category PIPELINE
2022-01-14 11:50:20 -08:00
47e2173239
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2021-12-16 08:42:54 +01:00
8a18b5e427
SL-16462 Fix for broken water clip plane during water reflection/refraction map render.
2021-12-07 16:32:38 -06:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00:00
381f8936f0
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llrender.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexture.cpp
2021-12-03 18:23:05 +01:00
e7830b39f0
SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey textures
2021-12-03 15:07:31 +00:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
49d750cd01
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-24 18:50:31 +01:00
bb379cb8cc
SL-13565 disable reflection render pass when all non-void water is occluded
2021-11-22 15:22:28 -07:00
4a59f6650f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-15 18:10:02 +01:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
5534781acf
SL-15333 Crash in glh_init_extensions
2021-11-12 17:21:50 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
4e8cd9437b
SL-16193 Fix for mesh selection outline not rendering correctly (and broken physics shapes display).
2021-10-26 14:07:00 +00:00
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
3e99853b29
SL-16138 remove checks for now-mandatory capabilities
2021-10-06 10:59:00 -06:00
c10d601ce8
SL-15999 - track --noninteractive state with gNonInteractive flag
2021-09-20 13:19:20 +01:00
e150a40ff8
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-02-02 15:16:17 +01:00
24e4b6867a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 15:00:04 +01:00
033d16747c
DRTVWR-525 fix build error resulting from 6.4.13 merge
2021-02-01 16:25:56 -07:00
f07b332ef0
Merge branch 'master' into DV525-merge-6.4.13
2021-02-01 15:59:08 -07:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
a0be0371d7
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 01:12:13 +01:00
21e2f3e974
Merge branch 'master' 6.4.12 into DRTVWR-510
2020-11-11 15:43:06 -07:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
9d5c64dddc
SL-14264 - ViewerStats added logging of most gGLManager fields
2020-11-10 13:11:08 +00:00
d12305496f
DRTVWR-510 clean up obsolete downstream-from-mDebugGPU code
2020-10-19 17:21:56 -06:00
a6058b0e9f
DRTVWR-510 remove obsolete mDebugGPU variable
2020-10-19 17:21:56 -06:00
7cd076c796
DRTVWR-510 remove all LL_SOLARIS conditionals
2020-10-08 17:16:22 -06:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
4e94745139
Merge branch 'master' 6.4.8 into DRTVWR-510
2020-08-18 10:22:40 -06:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
03955f96db
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 20:12:46 +02:00
5ba9660e42
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-07-24 00:36:12 +02:00
19d063952c
Merge master 6.4.6 into DRTVWR-510
...
Includes the conversion to VS2017 build tools.
2020-07-21 11:04:56 -06:00
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
7bbf3f5f7f
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
cff453ff51
Merge remote-tracking branch 'eep/master' into fs-eep-vs2017
2020-05-20 13:49:20 +02:00
6e988b3bad
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-19 10:44:44 +02:00
663489493e
SL-12970 Fixed char length crash
2020-05-07 21:31:55 +03:00
0007ff2660
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-07 12:29:58 +02:00
ca6f092929
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
2020-05-06 16:06:26 -04:00
30234c508b
Merge branch 'master' into DRTVWR-507-maint
2020-05-05 01:40:40 +03:00
05ddffb6ba
DRTVWR-510: Cleanup: Add link for Optimus global variable for nVidia driver.
2020-05-04 12:11:57 -06:00
94dc8f12f8
Merge branch 'master' into DRTVWR-507-maint
2020-04-27 15:16:21 +03:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
29fec00f3c
SL-12775 Run at high performance AMD gpu
2020-04-03 19:40:55 +03:00
9d5b897600
DRTVWR-494: Defend LLInstanceTracker against multi-thread usage.
...
The previous implementation went to some effort to crash if anyone attempted
to create or destroy an LLInstanceTracker subclass instance during traversal.
That restriction is manageable within a single thread, but becomes unworkable
if it's possible that a given subclass might be used on more than one thread.
Remove LLInstanceTracker::instance_iter, beginInstances(), endInstances(),
also key_iter, beginKeys() and endKeys(). Instead, introduce key_snapshot()
and instance_snapshot(), the only means of iterating over LLInstanceTracker
instances. (These are intended to resemble functions, but in fact the current
implementation simply presents the classes.) Iterating over a captured
snapshot defends against container modifications during traversal. The term
'snapshot' reminds the coder that a new instance created during traversal will
not be considered. To defend against instance deletion during traversal, a
snapshot stores std::weak_ptrs which it lazily dereferences, skipping on the
fly any that have expired.
Dereferencing instance_snapshot::iterator gets you a reference rather than a
pointer. Because some use cases want to delete all existing instances, add an
instance_snapshot::deleteAll() method that extracts the pointer. Those cases
used to require explicitly copying instance pointers into a separate
container; instance_snapshot() now takes care of that. It remains the caller's
responsibility to ensure that all instances of that LLInstanceTracker subclass
were allocated on the heap.
Replace unkeyed static LLInstanceTracker::getInstance(T*) -- which returned
nullptr if that instance had been destroyed -- with new getWeak() method
returning std::weak_ptr<T>. Caller must detect expiration of that weak_ptr.
Adjust tests accordingly.
Use of std::weak_ptr to detect expired instances requires engaging
std::shared_ptr in the constructor. We now store shared_ptrs in the static
containers (std::map for keyed, std::set for unkeyed).
Make LLInstanceTrackerBase a template parameterized on the type of the static
data it manages. For that reason, hoist static data class declarations out of
the class definitions to an LLInstanceTrackerStuff namespace.
Remove the static atomic sIterationNestDepth and its methods incrementDepth(),
decrementDepth() and getDepth(), since they were used only to forbid creation
and destruction during traversal.
Add a std::mutex to static data. Introduce an internal LockStatic class that
locks the mutex while providing a pointer to static data, making that the only
way to access the static data.
The LLINSTANCETRACKER_DTOR_NOEXCEPT macro goes away because we no longer
expect ~LLInstanceTracker() to throw an exception in test programs.
That affects LLTrace::StatBase as well as LLInstanceTracker itself.
Adapt consumers to the new LLInstanceTracker API.
2020-03-25 15:28:17 -04:00
a135b5b428
Merge remote-tracking branch 'origin/ll-vs2017' into fs-vs2017
2019-12-21 13:14:51 +01:00
Dave Parks