livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71,377 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

534 Commits (ed67ca001cee84b6771bcc5efafd27f8a40b35f5)

Author SHA1 Message Date
Ansariel ed67ca001c Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-08-09 11:05:56 +02:00
RunitaiLinden ec1d1f4354 SL-20094 Add "Select Reflection Probes" checkbox 2023-07-28 19:15:28 -05:00
Ansariel a63afaa978 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-22 10:37:07 +02:00
RunitaiLinden b67172aa12 SL-20010 Make reflection probes ignore touch actions. 2023-07-21 15:46:12 -05:00
Ansariel fe243a3042 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llworld.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-06-27 13:14:11 +02:00
RunitaiLinden 22eecf1018 SL-19897 Fix for 100% transparent objects not showing up in highlight transparent until LoD switch. 2023-06-23 11:46:09 -05:00
Ansariel 9d4eb9362e Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-05-19 11:27:04 +02:00
RunitaiLinden c827d32ebe SL-19655 Decruft legacy GLSL shaders and now unused build queues. 2023-05-17 18:09:36 -05:00
Ansariel aac968e43a Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/lluuid.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 2023-05-17 23:23:28 +02:00
RunitaiLinden 6f5f16e031 SL-19655 Remove concept of "low priority" updates (RenderDebugGLSession assertion stomping pass). Remove a couple unused debug settings and related code. 2023-05-17 13:40:33 -05:00
Ansariel 9057bfc995 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llcallstack.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llmath/llvolume.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llviewerstats.cpp
#	indra/newview/llvoavatar.cpp
 2023-05-05 12:35:33 +02:00
RunitaiLinden 1cadfd44fe DRTVWR-559 WIP - optimize ARC calculation et al. 2023-05-03 17:30:02 -05:00
Ansariel 9ffb2514db Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/llviewermenu.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-04-17 10:01:32 +02:00
RunitaiLinden 7c831d115b
SL-18458 Make LLVOCache the one source of truth on most recently received overrides. (#147) 2023-04-03 15:22:40 -07:00
Ansariel 5323ccf3b3 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llprofilercategories.h
#	indra/llcommon/lluuid.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/llagent.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexture.cpp
 2023-03-20 11:14:08 +01:00
Dave Parks 8d263197f0 SL-19371 Fix for occlusion culling getting stuck after teleport. 2023-03-13 11:16:23 -05:00
Dave Parks bd4b03de8b DRTVWR-559 Fix for assert in LLVertexBuffer, incidental decruft. 2023-03-10 13:33:36 -06:00
Dave Parks 25ede86382 SL-19172 Texture streaming tune up. Incidental decruft. 2023-03-10 10:52:35 -06:00
Ansariel f4182ddc7f Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2023-03-06 17:11:43 +01:00
Dave Parks 4ec8844f01 DRTVWR-559 Fix for occlusion culling going off the rails when settings change -- remove LLPipeline::resetVertexBuffers and add a sanity check to how long we wait for a query to be "available". 2023-02-27 10:42:53 -06:00
Dave Parks 579fc82f8a SL-19187 Fix for occlusion and shadow frusta debug displays not working as expected. 2023-02-10 14:19:09 -06:00
Ansariel ca5c9c9215 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/lldrawpoolterrain.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/llviewershadermgr.cpp
 2023-02-04 15:17:29 +01:00
Dave Parks 830cb6b665 SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space. 2023-02-03 17:18:39 -06:00
Ansariel d8eecb462a Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
#	indra/newview/llface.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
 2023-02-03 20:26:22 +01:00
Dave Parks 627e3d51c6 SL-19130 Fix for stuck LoD. 2023-02-02 11:31:34 -06:00
Ansariel 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
RunitaiLinden 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
Ansariel 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
Dave Parks a710bf9067 SL-18869 Optimizations -- Use _mm_prefetch to cut down on cache misses when iterating over render batches. 2023-01-09 15:18:57 -06:00
Ansariel 4d8c434846 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
 2022-12-08 12:18:18 +01:00
Dave Parks e9e37aa2ad SL-18784 Refactor physics shape display to not require its own render target. Remove "Hover Glow Objects" to free up a superfluous render target. 2022-12-06 16:15:27 -06:00
Ansariel d5298ac971 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpoolmaterials.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2022-11-20 23:13:06 +01:00
Dave Parks 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
Ansariel a1090f5f5d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# 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/lldrawpoolalpha.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/quickprefs.cpp
 2022-10-24 19:54:30 +02:00
Andrey Kleshchev 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
Ansariel 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
Dave Parks 26f99409d2 SL-18190 Temporarily disable occlusion culling by default -- not compatible with depth buffer management changes. 2022-10-07 12:52:43 -05:00
Ansariel 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
Howard Stearns 01d03edd85 SL-17967 - _ARB constant removal 2022-09-01 13:38:22 -07:00
Ansariel 3f145c0c3f Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563 
# Conflicts:
#	indra/llcommon/llframetimer.cpp
#	indra/llcommon/llprofiler.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
 2022-08-30 22:17:59 +02:00
Dave Parks 197ac7cc20 Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559 2022-08-30 10:46:36 -05:00
Ansariel 1e50da6b7a Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-07-27 02:06:54 +02:00
Cosmic Linden cdff716908 SL-17801: Don't let external code delete the raw pointer to the picking octree 2022-07-26 10:40:19 -07:00
Ansariel 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
Cosmic Linden 162280cd98 SL-17021: Templatize LLOctreeNode and related classes to allow for option to store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree. 2022-06-21 12:33:32 -07:00
Ansariel 6f7d07c6e6 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-18 15:52:15 +02:00
Ansariel 7185e97905 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llaudio/llaudioengine.cpp
#	indra/llaudio/llaudioengine.h
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llrender/llrender.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
 2022-06-15 10:38:52 +02:00
Ansariel 8e4abf8ea3 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-06-10 13:52:52 +02:00
Ansariel 87c38379e1 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-06-10 12:32:42 +02:00
Dave Parks 509476f95e SL-17574 Add probe detail combo box to advanced graphics preferences. Fix spot light shadows not working in probes. 2022-06-10 01:13:41 -05:00