Commit Graph

281 Commits (cd4883fcccb98887d1bf983beb18a8cffbd47e68)

Author SHA1 Message Date
Ansariel cd4883fccc Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/xui/en/strings.xml
2024-01-09 11:30:13 +01:00
RunitaiLinden 575dc8f410 SL-20754 Modify default midday to be a better approximation of Cloud Layers HDRI (addresses blue sheen). 2023-12-19 15:36:34 -06:00
Ansariel 9636801773 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-04 12:28:33 +02:00
RunitaiLinden bc4e90ea5e SL-20124 Wipe reflection probes when applying parcel EEP settings and pause updates on probes until transition completes. 2023-10-02 14:19:04 -05:00
Ansariel f075bf7599 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	.github/workflows/build_viewer.yml
#	indra/newview/llface.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewerregion.cpp
2023-08-31 18:09:40 +02:00
Aleric Inglewood 0b772853be Compile warning/error workaround.
For the life of me I can't figure out which variable is supposedly undefined:

In file included from /usr/include/string.h:548,
                 from /usr/include/c++/13.2.1/cstring:42,
                 from /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/indra/llcommon/linden_common.h:54,
                 from /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/indra/newview/llviewerprecompiledheaders.h:38,
                 from /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/indra/newview/llenvironment.cpp:27:
In function ‘void* memcpy(void*, const void*, size_t)’,

    inlined from ‘void boost::function2<R, T1, T2>::move_assign(boost::function2<R, T1, T2>&) [with R = void; T0 = const LLUUID&; T1 = LLViewerRegion*]’ at /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/build-linux-x86_64/packages/include/boost/function/function_template.hpp:993:24,

    inlined from ‘void boost::function2<R, T1, T2>::swap(boost::function2<R, T1, T2>&) [with R = void; T0 = const LLUUID&; T1 = LLViewerRegion*]’ at /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/build-linux-x86_64/packages/include/boost/function/function_template.hpp:862:22,

    inlined from ‘typename boost::enable_if_<(! boost::is_integral<Functor>::value), boost::function<R(T0, T1)>&>::type boost::function<R(T0, T1)>::operator=(Functor) [with Functor = LLEnvironment::onRegionChange()::<lambda(const LLUUID&, LLViewerRegion*)>; R = void; T0 = const LLUUID&; T1 = LLViewerRegion*]’ at /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/build-linux-x86_64/packages/include/boost/function/function_template.hpp:1121:22,

    inlined from ‘void boost::signals2::slot<R(Args ...), SlotFunction>::init_slot_function(const F&) [with F = LLEnvironment::onRegionChange()::<lambda(const LLUUID&, LLViewerRegion*)>; SlotFunction = boost::function<void(const LLUUID&, LLViewerRegion*)>; R = void; Args = {const LLUUID&, LLViewerRegion*}]’ at /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/build-linux-x86_64/packages/include/boost/signals2/detail/slot_template.hpp:160:24,

    inlined from ‘boost::signals2::slot<R(Args ...), SlotFunction>::slot(const F&) [with F = LLEnvironment::onRegionChange()::<lambda(const LLUUID&, LLViewerRegion*)>; SlotFunction = boost::function<void(const LLUUID&, LLViewerRegion*)>; R = void; Args = {const LLUUID&, LLViewerRegion*}]’ at /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/build-linux-x86_64/packages/include/boost/signals2/detail/slot_template.hpp:85:27,

    inlined from ‘void LLEnvironment::onRegionChange()’ at /opt/secondlife/viewers/firestorm/phoenix-firestorm-git/indra/newview/llenvironment.cpp:1150:52:
/usr/include/bits/string_fortified.h:29:33: error: ‘*(unsigned char (*)[24])((char*)&<unnamed> + offsetof(boost::self_type, boost::function<void(const LLUUID&, LLViewerRegion*)>::<unnamed>.boost::function2<void, const LLUUID&, LLViewerRegion*>::<unnamed>.boost::function_base::functor))’ may be used uninitialized [-Werror=maybe-uninitialized]
   29 |   return __builtin___memcpy_chk (__dest, __src, __len,
      |          ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~
   30 |                                  __glibc_objsize0 (__dest));
      |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~

where llenvironment.cpp:1150 is:
cur_region->setCapabilitiesReceivedCallback([](const LLUUID &region_id, LLViewerRegion* regionp) {  LLEnvironment::instance().
requestRegion(); });

Nevertheless, this has never led to a crash as far as I know; so,
probably a bogus warning indeed.
2023-08-28 18:04:50 +02:00
Ansariel a63afaa978 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-22 10:37:07 +02:00
Cosmic Linden e3565ff4dd SL-20036: Set probe ambiance to 0 for legacy midday 2023-07-19 11:23:31 -07:00
Ansariel a466a2b136 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llviewermedia.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/skins/default/xui/en/floater_adjust_environment.xml
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2023-06-02 11:50:25 +02:00
RunitaiLinden 50ec54831d
DRTVWR-559 Revert skies to be very close to release and disable tone mapping when probe ambiance is zero.
Hack for desaturating legacy materials has been removed for performance and quality reasons.

Adds a new setting for auto adjusting legacy skies.  This is the PBR "opt out" button.  If disabled, legacy skies will disable tonemapping, automatic probe ambiance, and HDR/exposure.  If enabled, legacy skies will behave as if probe ambiance and HDR scale are 1.0, and ambient will be cut in half.  

HDR scale will act as a sky brightener, but will automatically adjust dynamic exposure so the sky will be properly exposed.  If you want relatively even exposure all the time, set HDR Scale to 1.0.  If you want a high range of exposures between indoor/dark areas and outdoor/bright areas, increase HDR Scale.

Also tuned up SSAO (thanks Rye!).

Reviewed with Brad.
2023-06-01 19:49:23 -05:00
Brad Linden 8d20d61b4d Fix divide by zero causing NaN with certain day cycles in DRTVWR-559 2023-05-31 10:33:03 -07:00
Ansariel 4e416c48c2 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmodelpreview.cpp
#	indra/newview/skins/default/xui/en/menu_object.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-05-26 10:50:50 +02:00
RunitaiLinden 095c624d01 SL-19745 Fix for resetting reflection probes when reapplying the same sky setting. 2023-05-23 14:47:48 -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 bd7a924a94 DRTVWR-559 Balance midday to not be a touch green. 2023-04-12 18:01:39 -05:00
RunitaiLinden 63c5711914 SL-19569 Don't reset probes when crossing parcel borders (whoops) and tone down glare on legacy materials. 2023-04-12 13:44:41 -05:00
Dave Parks 84fb05efeb SL-19569 Reset probes when reverting sky settings to shared environment. 2023-04-12 11:52:20 -05:00
Dave Parks c53aabe33f DRTVWR-559 Update default midday to closely resemble a public domain HDRI (https://polyhaven.com/a/cloud_layers) 2023-04-12 11:33:29 -05:00
Dave Parks 086da3d6f8 DRTVWR-559 Make cloud pattern deterministic when cloud scroll is zero. 2023-04-12 09:55:00 -05:00
RunitaiLinden 2b2154f021
SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and brightness to allow ACES Hill all the time. 2023-04-11 15:09:58 -05:00
Dave Parks 413ce656c8 SL-19538 Clear probes on sky setting slam. Better probe update prioritization. Incidental decruft. 2023-04-07 14:10:53 -05:00
Dave Parks 72a0408401 SL-19538 Back off on sun brightening a bit, remove errant brightening of clouds, and update midday to not be red shifted. 2023-04-06 22:55:51 -05:00
RunitaiLinden 1f79379bf2
SL-19538 Followup -- tune exposure parameters and clamp local light ambiance. Make render targets 16F and scrube NaNs (thanks Rye). Update midday. (#154) 2023-04-05 11:55:51 -05:00
Ansariel 95e73bf131 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llviewermedia.cpp
2023-03-31 17:03:50 +02:00
cosmic-linden dd9d9f769d
Merge pull request #139 from secondlife/SL-19394
SL-19394: Update default midday per feedback
2023-03-23 15:12:43 -07:00
Cosmic Linden 2f97c6e142 SL-19394: Update default midday per feedback 2023-03-23 14:09:28 -07:00
cosmic-linden e14fb62e5b
Merge pull request #134 from secondlife/SL-19394
SL-19394: Change default midday to an asset ID with probe ambiance
2023-03-22 13:02:57 -07:00
Cosmic Linden 8d4430ffec SL-19394: Change default midday to an asset ID with probe ambiance 2023-03-22 12:57:38 -07:00
Dave Parks 8c7c4c424d DRTVWR-559 Quality pass -- Fix sky banding, fix off-by-one-mip in reflection probes (thanks Rye), remove noiseMap from light shaders (removes speckles), make irradiance maps RGB16F instead of RGBA16. Use actual luminance for sky instead of max color component during irradiance map pass. 2023-03-22 10:38:24 -05:00
Ansariel 73e5615d43 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
#	indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
#	indra/newview/llsettingsvo.cpp
2023-02-03 11:11:13 +01:00
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Ansariel 6cbca4da71 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/llcommon/lluuid.cpp
#	indra/llprimitive/llmodel.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/de/floater_about.xml
#	indra/newview/skins/default/xui/en/floater_about.xml
#	indra/newview/skins/default/xui/es/floater_about.xml
#	indra/newview/skins/default/xui/fr/floater_about.xml
#	indra/newview/skins/default/xui/it/floater_about.xml
#	indra/newview/skins/default/xui/pt/floater_about.xml
#	indra/newview/skins/default/xui/ru/floater_about.xml
#	indra/newview/skins/default/xui/tr/floater_about.xml
#	indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-01 11:40:17 +01:00
Dave Parks 10b8dcc497 SL-19015 Bump probe resolution back to 256 by default (drop to 128 if vram < 2GB), remove irradiance map feedback loop (one bounce, but but more stable and allows for much brighter first bounce), make sky contribution to irradiance not tint the world blue. Make irradiance that appears in radiance maps match world irradiance. 2023-01-30 18:56:19 -06:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
2022-12-12 22:09:54 +01:00
Ansariel 694ba6602f Merge branch 'main' of https://github.com/secondlife/viewer 2022-12-12 21:15:27 +01:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02: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
Andrey Kleshchev 7ceb266604 SL-18565 Built-in bump maps and some environment textures fail to load
Due to udp texture fetching no longer being present
2022-12-03 00:24:04 +02:00
Andrey Kleshchev 6de5986333 SL-18718 Crash at LLEventPump::listen and connection issues
Cleaner reinit and termination.
2022-11-28 17:25:43 +02:00
Ansariel 7732257ea5 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-02 13:05:00 +01:00
Andrey Lihatskiy 39e08b34b1 Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q 2022-11-01 23:11:57 +02:00
Ansariel 9ee1a75474 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcommon/lluuid.cpp
#	indra/llcommon/lluuid.h
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llscrolllistctrl.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/skins/default/xui/en/floater_settings_debug.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
2022-11-01 17:17:56 +01:00
Rye Mutt d0e07c770b Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type. 2022-10-30 06:56:16 -04:00
Andrey Lihatskiy 91f9f2e9f7 DRTVWR-570 Mac build fix: unused variables cleanup 2022-10-27 23:08:09 +03: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 b6e576c7c2 SL-18190 Cleanup -- convert some vec4's to vec3's (as they really are), remove some unused glsl files. 2022-10-11 20:20:39 -05:00
Ansariel 4dce4759e4 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-10-01 14:47:34 +02:00
Dave Parks aaf7b17db0 SL-18190 WIP -- Take 2 on linear space windlight (more methodical approach -- make desired interface but brute force color conversions). Placeholder PBR water and move to deprecate forward rendering shaders. 2022-09-27 23:32:02 -05:00