Commit Graph

81 Commits (b6253a7da4f7f7e265c3b1bc419317f548a81bac)

Author SHA1 Message Date
Ansariel b99cf9fb86 Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/cmake/APR.cmake
#	indra/cmake/Audio.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPrimitive.cmake
#	indra/cmake/Meshoptimizer.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/llaudio/llvorbisencode.cpp
#	indra/llcommon/linden_common.h
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llfasttimer.cpp
#	indra/llcommon/llfasttimer.h
#	indra/llcommon/llfile.cpp
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llfilesystem/lldir_win32.cpp
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/llkdu/llimagej2ckdu.h
#	indra/llkdu/llkdumem.h
#	indra/llplugin/slplugin/CMakeLists.txt
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llwindow/CMakeLists.txt
#	indra/llwindow/llopenglview-objc.mm
#	indra/llwindow/llwindowmacosx-objc.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/media_plugins/cef/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
Beq 1b2b80e203 Enhanced debug rendering for probes 2025-06-21 02:57:01 +01:00
Hecklezz eb9b1fc58f [FIRE-35615] Fix reflections turning black when zoomed in close 2025-06-09 03:11:18 +10:00
Beq 5a14d48a94 [FIRE-35007][#3331] Mirrors not working after relog even when enabled.
This fixes the bug, but the deeper problem of NaN behaviour under fastmath needs to be examined.
2025-03-22 00:47:28 +00:00
Jonathan "Geenz" Goodman e0d14e02e1 Merge branch 'release/2025.03' into rye/forevermac 2025-03-11 22:44:49 -04:00
Ansariel e518cba882 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llrender/llfontfreetype.h
2025-02-26 10:04:47 +01:00
Jonathan "Geenz" Goodman ae7658de24 Mitigation for #3331 2025-02-25 08:50:25 -05:00
Rye 6fcd349f37 Fix Tracy memory profiling overloads for aligned allocations
Fix disabling renderdoc support
Improve ll_aligned_alloc functions on darwin for 32 and 64byte aligned by utilizing posix_memalign
2025-02-11 05:04:05 -05:00
Ansariel ad283258e0 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llprogressview.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/skins/default/xui/de/panel_progress.xml
#	indra/newview/skins/default/xui/en/panel_progress.xml
#	indra/newview/skins/default/xui/fr/panel_progress.xml
#	indra/newview/skins/default/xui/pl/panel_progress.xml
2025-01-15 11:19:52 +01:00
Andrey Kleshchev 4ff1cbfbff #3316 Crash in LLReflectionMap::getIsDynamic() 2025-01-11 00:20:01 +02:00
Rye c883c7f2d9 Drop reflection probes and mirrors to RGBA8 when hdr is disabled to minimize vram usage and chance of probe nans (#2558) 2025-01-09 20:43:45 -05:00
Beq 023a4602d9 Possible fix for a variety of environment crashes in STATE_PRECACHE 2024-10-26 13:41:32 +01:00
Beq b0f7ad8e18 FIRE-34587 bugsplat - echoes of previous mirror related splats.
Assumption: When a viewer object is destroyed and unregistered, references to it in mNearestHero and mDefaultProbe->mViewerObject are not cleared, leading to dangling pointers.
2024-09-30 13:14:07 +01:00
Ansariel 01f9dbc4e3 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llallocator_heap_profile.cpp
#	indra/llui/lllayoutstack.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/lltextureview.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_colors.xml
2024-08-20 11:21:57 +02:00
Rye Mutt d79ff40ee2 Fix hero probes not releasing resources when disabled 2024-08-17 18:23:58 -04:00
Ansariel 088cc2ea35 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llpointer.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llstatgraph.cpp
#	indra/llui/llvirtualtrackball.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaceprofile.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
Ansariel 9fdca96f8b Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
Ansariel 9a2b83b294 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llmemory.cpp
#	indra/llmessage/CMakeLists.txt
#	indra/llmessage/llfiltersd2xmlrpc.cpp
#	indra/newview/lldebugview.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/llheroprobemanager.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llslurl.cpp
#	indra/newview/llsurface.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llversioninfo.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llworld.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/de/floater_about.xml
#	indra/newview/skins/default/xui/de/menu_viewer.xml
#	indra/newview/skins/default/xui/en/floater_about.xml
#	indra/newview/skins/default/xui/es/floater_about.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/fr/floater_about.xml
#	indra/newview/skins/default/xui/it/floater_about.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/ja/menu_viewer.xml
#	indra/newview/skins/default/xui/pl/menu_viewer.xml
#	indra/newview/skins/default/xui/pt/floater_about.xml
#	indra/newview/skins/default/xui/pt/menu_viewer.xml
#	indra/newview/skins/default/xui/ru/floater_about.xml
#	indra/newview/skins/default/xui/ru/menu_viewer.xml
#	indra/newview/skins/default/xui/tr/floater_about.xml
#	indra/newview/skins/default/xui/tr/menu_viewer.xml
#	indra/newview/skins/default/xui/zh/floater_about.xml
#	indra/newview/skins/default/xui/zh/menu_viewer.xml
#	scripts/messages/message_template.msg.sha1
2024-07-02 18:08:57 +02:00
Ansariel 20294e9ee8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
2024-07-02 01:23:35 +02:00
Beq fcc7d16108 Fix for various TP where a mirror is present
these manifest as crashes in isDynamic, isBox and similar calls that are accessed through a dangling probe.
2024-07-01 17:22:07 +01:00
Beq c5bbc8dac4 Tag the fix 2024-06-30 15:51:45 +01:00
Beq b225399a7d FIRE-34201 - Crash on TP to Mirror
Multiple different crashes seemingly caused by a long  dead volume pointer.
Matches multiple bug splat ids.
Trigger details: have a mirror present and working. TP away, TP to a few other places. Importantly, the other places should not have any mirrors.
TP back to mirror. I believe that because the probe was never overwritten by another, upon return the code tries to reuse it only to find that the pointer is garbage.
The fix tries to ensure that the associated refelction map is cleaned up when the probe goes out of scope.
2024-06-30 15:49:06 +01:00
Ansariel 364a14a8aa Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llprofilercategories.h
2024-06-21 22:45:12 +02:00
Dave Parks 80ea30af1a
#1769 gltf optimization pass (#1816)
#1814 and #1517 Fix mirror update rate and occlusion culling
2024-06-21 13:13:08 -05:00
Ansariel 45ab5c68ee Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llrender/llgl.h
#	indra/newview/fspanelface.cpp
#	indra/newview/fspanelface.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llheroprobemanager.cpp
#	indra/newview/llviewercamera.cpp
#	indra/newview/llviewercamera.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/vjlocalmesh.cpp
2024-06-21 19:58:00 +02:00
Beq f5a6ff4880 optimise heroprobe activation a bit more. 2024-06-16 17:57:09 +01:00
Beq 362be6b939 LL Issues 1719/1721Interim fix for mirrors not turning off.
two issues relating to the same problem.
both essentially housekeeping issues when probes are disabled or go out of view.
2024-06-15 23:22:42 +01:00
Brad Linden a7b0f93911 Fixed signed/unsigned warnings after they got enabled in the maint-A merge 2024-06-11 15:39:48 -07:00
Brad Linden 7889df945b Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development 2024-06-04 17:39:39 -07:00
Jonathan "Geenz" Goodman c413458fd4
#1628 Disable spherical mirror probes for the time being. (#1631) 2024-06-04 15:22:38 -07:00
Jonathan "Geenz" Goodman 01c82642ac
#1581 Only render mirrors when reflection probes are enabled. (#1592) 2024-05-29 19:31:58 -07:00
Jonathan "Geenz" Goodman 33bb511ab4
Improvements to mirror probe update rates (#1570)
#1494 Fix for mirror updates getting "stuck" on some faces.
2024-05-28 14:19:18 -07:00
Brad Linden a1f49564d6 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-23 11:31:19 -07:00
Andrey Lihatskiy b06a99f7c7 Post-merge spaces fix 2024-05-15 12:47:27 +03:00
Brad Linden 31a3423239 Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development 2024-05-14 11:07:13 -07:00
Jonathan "Geenz" Goodman ca5e89d741
Even more mirror fixes. (#1429)
#1271 Add support for mirrors that do not have avatars in them.  It does this based on if the probe is set to dynamic or not.

#1370 More optimization work to reduce GPU utilization.

#1058 - Removed sim feature flag that was overriding mirrors enabled flags

secondlife/viewer-private#128 - Locally cache the mirror probe

#679 Add additional options to the build floater for mirror probes, including descriptions.
2024-05-08 11:28:51 -07:00
RunitaiLinden 8b747cee18 BOOL to bool 2024-05-06 16:49:24 -05:00
Jonathan "Geenz" Goodman 7ef2b43802
Multiple fixes for mirrors. (#1192)
* #1064 Fix for mirror surfaces going black when the roughness is set too high.

* #1130 Fix for the user's avatar not appearing in mouselook in a mirror.

* #1059 Disable mirrors on low settings per the feature table.

* #860 Modify the settings UI to better reflect that we only have two AA modes: off and FXAA.

* #1191 Add some settings for mirrors in preferences.

* #1185 Add support for runtime mirror resolution changing.  Useful for quality settings, and auto-FPS.
2024-04-10 15:21:59 -07:00
RunitaiLinden ef75523555
983 add debug setting to control the maximum download resolution (#986)
* Create RenderMaxTextureResolution.md

* #983 Add RenderMaxTextureResolution setting.  Incidental crash fix.
2024-03-13 12:22:12 -05:00
Jonathan "Geenz" Goodman 4b738a619a #681 Small fix for if a viewer object may be dead. 2024-03-06 18:24:36 -08:00
Jonathan "Geenz" Goodman 1fc45a50ff #681 Add probe blending for mirrors. 2024-03-06 17:56:16 -08:00
Jonathan "Geenz" Goodman b3283036af #681 Start adding blending boilerplate. 2024-02-26 04:02:09 -08:00
Jonathan "Geenz" Goodman 8c79297a89 #682 Further tweak the conservative update mechanism. 2024-02-26 01:21:41 -08:00
Jonathan "Geenz" Goodman 1b8523a7b6 #890 Make sure we're doing the correct distance check.
#682 Improve the conservative update functionality for mirror faces.  Make it attenuate depending on how much the camera is facing that specific cubemap face.
2024-02-26 00:30:44 -08:00
Jonathan "Geenz" Goodman 2ba5449b8b #889 Start removing mDrawable references. These may be null. 2024-02-25 23:38:11 -08:00
Jonathan "Geenz" Goodman 3202587297 #682 Add a low priority path for conservative probe face updates. This will update the "low priority" faces at half of the the probe update rate. Useful for less planar reflection geometry. 2024-02-25 22:52:23 -08:00
Jonathan "Geenz" Goodman e68735ad3a #682 Add an update rate parameter to help throttle mirror updates.
So far 4 seems like a good balance for performance and quality.  2 is great for quality, with 6 or 8 being for higher performance.  Also bring back the gaussian filter - may end up adding the FXAA filter though instead.
2024-02-21 11:51:46 -08:00
Jonathan "Geenz" Goodman 8cea285114 #682 Separate out the radiance gen. 2024-02-20 18:21:45 -08:00
Jonathan "Geenz" Goodman 7a9cdf2b52 #682 Do conservative updates on probes. 2024-02-15 09:38:29 -08:00
RunitaiLinden a7310ae741 #671 Nudge RenderMirrors and clear shader cache as needed based on SimulatorFeatures 2024-02-08 15:07:54 -06:00