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
07bca31e06
SL-18190 Fix alpha not playing nice with water surface by split LLDrawPoolAlpha into two passes, one above water, one below water, and clip against water plane. Currently brute forces two complete alpha passes, still need to cull against water plane and add support for fullbright shaders.
2022-10-10 18:53:43 -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
01d03edd85
SL-17967 - _ARB constant removal
2022-09-01 13:38:22 -07:00
8e4abf8ea3
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-06-10 13:52:52 +02:00
bc85cc300d
SL-17551 Followup -- remove some dead pick-render related code.
2022-06-09 14:26:23 -05:00
cd65f05b15
misc minor fixes
2022-06-05 16:47:33 +01:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# 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 10:12:19 +01: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
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
31e8e6fac0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-10 12:42:15 +01:00
fd98fbf0a5
Disable "-Wmismatched-new-delete", certainly needs another set of eyes to glance over this, but it appears hidden under a layer of templates, operators and inheritance the right thing happens:
...
new > posix_memalign / delete -> free. According to the man pages this would be correct.
2022-02-10 10:31:48 +01:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
352b820258
SL-16606: Add profiler category DRAWABLE
2022-01-14 11:50:19 -08:00
265bca5d63
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-13 21:18:22 +01:00
04edc15185
SL-16544 Fix for rigged mesh bounding boxes
2022-01-13 17:04:46 +00:00
d06070241a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llvovolume.cpp
2021-12-16 10:09:12 +01:00
8bf5597db2
SL-16487 Fix for rigged attachment bounding boxes being too tight.
2021-12-15 13:43:58 -06:00
d881fa40d3
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-20 22:35:31 +01:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00: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
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
e7227afe02
SL-16166 Apply optimizations from pushBatch to other render call sites. Optimize out a map lookup in rigged face rendering.
2021-10-14 13:02:40 -05:00
0c23720e73
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 12:47:04 +02: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
9563cf0556
SL-15415 Crashes in updateGeometry
2021-10-06 23:38:26 +03:00
6c53fbfb47
SL-16014: Add Tracy markup for lldrawable
2021-09-22 14:38:43 -07:00
a38e971f8d
Updates for non-allocating llsd changes (via Rye)
2021-06-13 12:37:29 +01:00
0a9cee37f0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-18 17:52:10 +01:00
a951a2ae35
Merge branch 'master' v6.4.14 into DV525-merge-6.4.14
2021-02-17 14:17:35 -07:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
5af5498cf6
SL-11300 Camera distance to avatar in neighbouring region incorrect
2021-01-06 22:52:18 +02:00
d8ec51961f
Merge branch 'DRTVWR-517' of https://bitbucket.org/lindenlab/viewer
2020-12-10 19:40:18 +01:00
caea7260c7
SL-14142 - impostor management cleanup
2020-10-20 18:56:44 +01:00
9618df484b
SL-14130 Jellydolls have wrong appearance when non-impostors is uncapped
2020-10-16 23:16:04 +03:00
ce68c75e58
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llvoavatar.cpp
2020-05-19 11:31:26 +02:00
7d46d6fb21
SL-12026 Fix issue with constant bridge recreation for animeshes
2020-05-14 20:37:36 +03:00
209f3700d1
Merge viewer-cougar
2019-10-30 18:58:52 +01:00
a4199b3e3c
SL-12026, SL-1232 and SL-11614
2019-10-25 18:12:47 +03:00
4f5d785226
SL-12014 Animesh is now a separate rendering type
2019-10-25 17:32:19 +03:00
61a6beb2e8
BUG-227041 Camera distance to avatar in neighboring region incorrect
2019-05-29 00:21:57 +01:00
4d4255c27b
SL-1350 - keep control avatar rotation synced to corresponding root drawable
2018-09-27 19:34:41 +01:00
301821337b
SL-9680, SL-9673 - set attachment distance floor at 0.01 to avoid triggering divide-by-zero prevention logic. Force HUD attachments to always be full detail.
2018-09-19 15:53:44 +01:00
2d26846d9f
Clean up includes
2018-12-14 00:53:52 +01:00
3b3b2a7105
Fix up alignment error that was breaking 32bit builds
2018-11-16 13:19:21 +00:00
35ecc970b0
Clean up unnecessary stuff and more JointMatrix Palette caching tweaks.
...
Move cache to drawable for more benefit. Reduces CPU overhead when rendering
shadows and materials by caching the jointmatrixpallette.
Sacrifices some potential cache locality but savings seem to outweigh this.
2018-11-15 20:56:35 +00:00
e1a86494e1
SL-1350 - keep control avatar rotation synced to corresponding root drawable
2018-09-27 19:34:41 +01:00
d5fdcd67ab
Merge axon
2018-09-25 17:45:20 +02:00
d9cc027cd8
SL-937 - use dynamic box for rigged mesh attached to normal avatar as well. Still has a 2x error in the radius calc, but gets radius using the dynamic box.
2018-07-31 21:57:42 +01:00
Ansariel