e85546fc3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-07-18 11:17:02 +02:00
289fb458f3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/llprimitive/llmaterial.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenufile.cpp
# indra/newview/llvovolume.cpp
2023-07-18 10:59:02 +02:00
f975cfd736
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-07-17 13:37:03 -07:00
6628320130
SL-19567: Add option RenderGlowNoise for low precision glow dithering, enabled by default
2023-07-12 15:44:15 -07:00
9ac97bed1a
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llopenglview-objc.mm
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
2023-06-19 11:39:41 +02:00
ffac2df6ca
Merge branch 'DRTVWR-559' into DRTVWR-583-glossy-ssr
2023-06-11 20:56:02 -07:00
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
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
47e311d6e8
Addressing some performance related feedback with SSR getting drastically slower.
...
DRTVWR-559
DRTVWR-583
2023-05-26 16:56:33 -07:00
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
0c7205e5f1
SL-19560 Better fix for blurry BoM textures.
2023-05-23 10:55:50 -05:00
b273edd125
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-05-22 10:42:18 -07:00
9d4eb9362e
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-05-19 11:27:04 +02:00
87bda55268
Add a binary cache for compiled shaders using glProgramBinary ( #216 )
...
* Add a binary cache for compiled shaders using glProgramBinary
* Add additional sanity checking to shader binary save and load, hook up cache clear and menu option
* Fix default init of shader cache data struct and clear gl errors before glGetError calls
---------
Co-authored-by: RunitaiLinden <davep@lindenlab.com>
2023-05-17 18:30:27 -05:00
446d0cbf7f
SL-19655 Clean up some missed "texture2D" vs "texture" (thanks Rye)
2023-05-17 18:28:01 -05:00
c827d32ebe
SL-19655 Decruft legacy GLSL shaders and now unused build queues.
2023-05-17 18:09:36 -05:00
4d0ebf6143
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewerdisplay.cpp
2023-05-17 18:02:50 +02:00
ee0b330b2d
DRTVWR-559 Decruft deprecated OpenGL flags.
2023-05-16 20:31:29 -05:00
cdc9852f05
SL-19709 Fix for fullbright shiny not factoring out exposure and flickering fullbright alpha. Incidental decruft.
2023-05-15 11:01:24 -05:00
8e9b3a8f37
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/pipeline.cpp
2023-05-12 12:06:57 +02:00
ad4118f6ce
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-05-11 21:21:01 -07:00
339e02ef33
Finally get glossy SSR up.
...
DRTVWR-583
2023-05-11 21:19:58 -07:00
026ef1935d
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
...
Rather than continuing to propagate try/catch (Closed)
(aka LLThreadSafeQueueInterrupt) constructs through the code base, make
WorkQueueBase::post() return bool indicating success (i.e. ! isClosed()).
This obviates postIfOpen(), which no one was using anyway.
In effect, postIfOpen() is renamed post(), bypassing the exception when
isClosed().
Review existing try/catch blocks of that sort, changing to test for post()
returning false.
2023-05-08 12:07:31 -04:00
b318e24f25
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llglslshader.cpp
# indra/newview/lldrawable.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-05-03 14:59:31 +02:00
e09475713b
DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall.
2023-05-02 18:47:21 -05:00
11e9d2cdb6
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/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_adjust_environment.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2023-04-29 23:32:04 +02:00
a3b1d0beb6
SL-19197 Fix for crash in LLRenderTarget::release
2023-04-27 16:05:07 -05:00
88adfdcee4
DRTVWR-559 Add "No Post" mode and refactor "Scene Gamma" into "Brightness" for adjusting legacy gamma when probe ambiance is 0 and dynamic exposure when probe ambiance is not zero.
2023-04-26 20:47:04 -05:00
45fdf20c3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/llviewercontrol.cpp
# indra/newview/pipeline.cpp
2023-04-21 18:32:34 +02:00
b36cc1444f
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-559
2023-04-17 10:02:15 +02:00
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
18efcb8814
Linux: Minor cmake cleanup
2023-04-17 13:34:43 +10:00
a6693e9c9e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
2023-04-16 18:59:53 +02:00
d61d70e19d
Linux: make it build
2023-04-16 18:19:07 +02:00
f4274ba64e
Move mipmap generation into LLRenderTarget.
...
DRTVWR-583
2023-04-14 03:08:28 -07:00
6d5c169716
Merge branch 'DRTVWR-559' into DRTVWR-559-post-refactor
2023-04-12 15:18:27 -07:00
58df456675
Fixed DoF
2023-04-12 14:50:14 -07:00
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
56b21054eb
Get DoF working
...
Need to fix up bloom.
DRTVWR-559
SL-19524
SL-19513
2023-04-10 11:29:50 -07:00
bb79718c8f
SL-19538 Followup -- scrub all possible sources of NaNs, make dynamic exposure controls not persist, limit exposure range, and do a debug gl pass.
2023-04-06 13:21:25 -05:00
5bf60f5d9e
SL-19538 Followup -- fix for dynamic exposure having large gaps in it… ( #157 )
...
* SL-19538 Followup -- fix for dynamic exposure having large gaps in its luminance sampling.
* SL-19538 Followup -- review feedback changes.
2023-04-05 16:48:34 -05:00
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
d6d634d29f
SL-19331: Move media updates off-thread on select hardware ( #153 )
...
* SL-19331: Have media updates on the LLImageGL thread even when texture updates are on the main thread. Add config.
Off-thread media updates seem work best performance-wise when using glTexImage2D, not sub_image_lines. Otherwise, there are lots of main thread stalls.
* SL-19331: Bump featuretable
* SL-19331: Cleanup, annotate comment
2023-04-05 11:55:33 -05:00
698966f8e7
SL-19538 Remove hacky ambiance scale and take the mittens off probe a… ( #151 )
...
* SL-19538 Remove hacky ambiance scale and take the mittens off probe ambiance values. Fix for sky brightening being done in sRGB space.
2023-04-04 10:29:12 -07:00
8ef61f6171
Remove stray comment marker, oops!
2023-04-03 05:30:49 +02:00
4e306c9066
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
2023-03-31 10:54:22 -07:00
b44ad50f75
Move glow extract to be after tonemapping.
...
SL-19513
2023-03-31 10:54:19 -07:00
68e5f326b3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
2023-03-31 18:54:16 +02:00
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
5baeb998eb
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
2023-03-30 13:08:32 +02:00
Ansariel