dedee8ba50
initial merge form DRTVWR-539 branch
2022-11-02 22:37:24 +00:00
7786f2bb9c
[FIRE-32132] Allow rigged mesh transparency to toggle independently
...
Also added different colours for rigged-blend (orange)/rigged-masked(cyan)
ctrl|alt|shift|T toggles the rigged mesh display on/off
2022-10-22 20:26:36 +01:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
b66f2e7da7
SL-18202 WIP merging autotune contribution and updating UI
2022-09-21 21:19:17 +03:00
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
3e1db1f184
SL-17532 Cleanup from hasty commit (thanks to Henri for the prodding).
2022-06-07 10:36:59 -05:00
616f2b639b
SL-17532 Potential fix for some rigged mesh draw order issues.
2022-06-06 19:57:03 -05:00
410704b5c6
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-03 11:37:50 +02:00
1a6eee4ea2
SL-17321 Fix for some particle systems with custom blend functions not rendering.
2022-05-02 11:52:45 -05:00
a775b9fc7f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-04-19 15:49:47 +02:00
e33f23f58a
SL-17194 Impostor quality pass 2 (and fix for fully transparent rigged attachments rendering to depth buffer)
2022-04-11 20:06:33 -05:00
1d057dbba2
SL-17173 Impostor quality pass.
2022-04-11 15:51:51 -05:00
e20aafa2fe
SL-16907 Crash at updateSkinInfoMatrixPalette #2
2022-04-07 14:17:30 +03:00
41cf9fcb05
SL-17028 Fix for inconsistent ordering of transparent rigged meshes and removal of glow-only rigged meshes from depth buffer.
2022-03-24 14:48:06 -05:00
cc95d520b4
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llvovolume.cpp
2022-03-02 10:31:44 +01:00
658a30bd2e
SL-16907 Potential fix for crash in updateSkinInfoMatrixPalette
2022-02-24 13:04:40 -06:00
ccb078ae08
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-02-02 10:03:48 +01:00
0b850360f5
SL-16714 and SL-16750 Break rigged alpha into its own pass (restore release like behavior) and fix rigged alpha emissive not rendering.
2022-02-01 22:28:02 +00:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
cfd39c3663
SL-16606: Add profiler category DRAWPOOL
2022-01-14 11:50:19 -08: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
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
9ac89bca2c
SL-16493: Add comment about using deferred shaders even though we are in a post deferred state (forward pass rendering for transparency)
2021-12-15 14:11:02 -08:00
6164d465af
SL-16493: Fix non-fullbright partial alpha objects not being lit by sun broken in 511de439a3
2021-12-15 10:39:00 -08:00
1a6ef9a1fb
SL-16468 Fix for crash when enabling highlight transparent (add rigged mesh support to highlight transparent).
2021-12-08 15:35:25 -06: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
511de439a3
SL-16405 Remove “pass == <magic number>” anti-pattern from various drawpools.
2021-12-02 20:11:43 +00: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
790ead2ef2
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-541
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/lltracerecording.h
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2021-11-12 17:43:32 +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
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
d06c357bab
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-12 11:02:00 +01: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
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
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
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
390c136430
Migrate perfstats away from telemetry/profiling
...
perfstats is now a standalone module.
2021-10-13 02:04:05 +01:00
b98cf49531
Remove logging in drawpool resulting from EEP water reflection changes.
...
There may be a better way to prevent this overhead, for now remove the logging overhead.
2021-02-07 17:35:55 +00:00
13086737cc
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-05-19 21:50:44 +02:00
945c7e4f64
Micro optimization in alphas drawpool
2020-05-10 23:21:33 +02:00
256ba88003
Re-add particle rendering optimization from dbfcd6c9c5 LL got lost for over 7 years now...
2020-05-10 23:13:53 +02:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
3a990bd2b9
SL-1706 Material alpha mask highlight color should be blue
2020-02-18 14:07:35 +02:00
604dd5b227
SL-1395 Alpha-masked faces not highlighted when materials present
2020-02-17 18:56:51 +02:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
7f24395889
SL-11318
...
Make alpha pass start with no shader bound.
Make diffuse mode alpha-blended fullbrights get into alpha pass properly.
2019-06-19 08:31:43 -07:00
58f7b981bd
SL-11337
...
Fix handling of ambient (was getting reset to 1,1,1,1 unintentionally).
Modify shaders to balance ambient across render modes again.
2019-05-31 13:47:44 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
Beq