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

243 Commits (b80fefa0ab1bfdaabeb4b8a39ca046295db66907)

Author SHA1 Message Date
Ansariel b80fefa0ab Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
 2022-10-13 13:33:56 +02:00
Dave Parks 42ec639c86 SL-18190 Remove water reflection detail combo box and reimplement "Transparent Water" checkbox. 2022-10-12 14:46:51 -05: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 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
Dave Parks 18309bc7fb SL-18190 Fix for DoF 2022-10-07 15:25:48 -05:00
Dave Parks 9448db5d4a SL-18190 Water shader WIP. Better parallax correction for sphere probes. Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage. 2022-10-06 18:40:01 -05:00
Ansariel 4dce4759e4 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-10-01 14:47:34 +02:00
Dave Parks 44f2286e42 SL-18190 Use bindDeferredShader in alpha pool. Don't redundantly apply ao to irradiance. 2022-09-26 18:08:42 -05:00
Dave Parks 725d042640 SL-18190 WIP - Windlight to linear space proof of concept, better parity between release viewer and materials viewer when reflections disabled. Avoid run-away probe ambiance. 2022-09-26 17:17:34 -05:00
Ansariel 5178e59b59 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-16 09:37:16 +02:00
Dave Parks 47e039ce1f SL-17701 Fix for legacy material parameters/textures overriding GLTF materials in alpha pool. 2022-09-14 12:37:23 -05:00
Ansariel 82e545fa92 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-14 09:22:29 +02:00
Dave Parks 2a5219b23f SL-17701 WIP -- Correct color space management for base color and emissive color factors and textures. Support for double sided alpha blended PBR materials. 2022-09-13 18:41:24 -05:00
Dave Parks 402ab8c8f6 SL-17701 WIP -- Cleanup/refactor PBR lighting implementation and get parity between deferred and alpha passes for sunlight and IBL. 2022-09-13 15:25:15 -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
Ptolemy 03df954509 SL-17701: PBR: Tweak lighting in alpha blending 2022-09-12 01:22:47 -07:00
Ptolemy 9cb8ed9210 SL-17701 PBR: Cleanup alpha setting EEP shader uniforms 2022-09-09 03:57:39 -07:00
Ptolemy 049fc419d1 SL-17701: PBR: WIP Alpha Blending 2022-09-09 03:28:12 -07:00
Ansariel 3765c775cb Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-05-21 15:04:54 +02:00
Dave Parks 6eaf8521ab SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render. 2022-05-20 19:05:28 -05:00
Dave Parks b2141e9446 Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559 2022-05-16 12:26:17 -05:00
Dave Parks 3400e5fd30 SL-17284 Reflection probe tuning and optimization take 1 2022-05-16 17:21:08 +00:00
Ansariel 410704b5c6 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-05-03 11:37:50 +02:00
Dave Parks 1a6eee4ea2 SL-17321 Fix for some particle systems with custom blend functions not rendering. 2022-05-02 11:52:45 -05:00
Ansariel a775b9fc7f Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-04-19 15:49:47 +02:00
Dave Parks 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
Dave Parks 1d057dbba2 SL-17173 Impostor quality pass. 2022-04-11 15:51:51 -05:00
Andrey Kleshchev e20aafa2fe SL-16907 Crash at updateSkinInfoMatrixPalette #2 2022-04-07 14:17:30 +03:00
Dave Parks 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
Ansariel 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
Dave Parks 658a30bd2e SL-16907 Potential fix for crash in updateSkinInfoMatrixPalette 2022-02-24 13:04:40 -06:00
Ansariel ccb078ae08 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-02-02 10:03:48 +01:00
Dave Parks 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
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy cfd39c3663 SL-16606: Add profiler category DRAWPOOL 2022-01-14 11:50:19 -08:00
Ansariel 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
Ansariel 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
Ptolemy 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
Ptolemy 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
Runitai Linden 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
Ansariel 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
Dave Parks 511de439a3 SL-16405 Remove “pass == <magic number>” anti-pattern from various drawpools. 2021-12-02 20:11:43 +00:00
Ansariel d881fa40d3 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-20 22:35:31 +01:00
Dave Parks 28f9fb06a9 SL-16289 Rigged mesh rendering overhaul 2021-11-20 18:49:19 +00:00
Ansariel 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
Ansariel 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
Ansariel 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
Ansariel d06c357bab Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-12 11:02:00 +01:00
Beq 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
Dave Parks 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