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
2d514e4b10
SL-10763
...
Fix broken logic for alpha drawpool when rendering with basic shaders off.
Force unbind of 2nd tex unit that we use during water rendering.
2019-03-19 17:24:16 -07:00
69f5ab9004
Make alpha drawpool optimizations an opt-in render debug setting for the adventurous.
2019-03-15 14:31:32 -07:00
d5f3e7f28e
Disable optimizations to batch fullbright and emissive draws together to minimize GL blend state changes.
2019-03-15 14:09:23 -07:00
83941a5ec6
Restore optimizations for fullbright/emissives with changes to fix lighting breakage when they're in play.
2019-03-15 13:05:56 -07:00
a10ec81e82
SL-10743, SL-10744
...
Don't step on SUNLIGHT_COLOR uniform w/ syncLightState competing set.
Put drawpool alpha render loop lighting setup changes as they were
(this will give back some performance and possibly require reopening 10566).
2019-03-15 08:13:04 -07:00
3396b728d2
Don't rebuild reflection when only edge water patches are in play.
...
Use (Restore)TexSetup for tex binding (should be equivalent now).
Simplify uniform management in alpha drawpool loop.
Fix wrong modelview mat being used for distortion map gen.
2019-03-05 09:35:04 -08:00
f3303654a5
Roll back even more alpha draw pool optimizations that break particles.
2019-03-04 16:20:31 -08:00
659eaf045e
Fix line-endings.
2019-03-04 15:40:07 -08:00
cc43bee5b1
Factor emissives and fullbrights out of alpha draw pool loop of death.
2019-03-04 14:13:27 -08:00
f1fe689e18
SL-10566
...
Put back old alpha pool draw loop with option to render emissives out of order to save state changes.
2019-03-04 13:19:39 -08:00
0b4982ac89
Roll back optimizations to lldrawpoolalpha causing emissive strangeness and alpha materials lighting errors.
2019-03-04 10:31:55 -08:00
552267f1c9
Fix unused local var 'partition' and avoid assert in rendering highlights.
2019-03-04 09:50:11 -08:00
45a541d2d5
SL-10566
...
Disable pre-cull of water causing refraction/reflection map generation more than is necessary.
Re-org alpha draws to limit state changes based on render type.
2019-03-04 08:04:18 -08:00
4c3050a395
SL-10664, SL-10666
...
Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly.
Baseline for performance work.
2019-03-03 10:42:19 -08:00
772924252b
Merge viewer-eep
2019-02-28 23:38:39 +01:00
c1d2416826
EEP performance WIP
...
Mods to improve alpha obj render performance.
Removes hacky fix for HUD elements getting atmospherics.
Re-orders rendering of glow to remove ~10ms/frame of shader re-re-rebinding.
Fix up default classes and basic shader loading (remove unused shared modules).
2019-02-28 14:06:19 -08:00
d7ad30a2d4
SL-10566 part the fourth
...
Fix water rendering causing distortion map update very frame.
Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness).
Add ability to retrieve current user clip plane so it can be saved/restored around water map gen.
Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again.
Re-enable occlusion in distortion map rendering.
2019-02-27 17:07:31 -08:00
acb6fda901
Merge viewer-eep
2019-01-26 00:02:49 +01:00
Ansariel