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

158 Commits (b6cdbebb98bb0472e498921b95bab547aeb3eb38)

Author SHA1 Message Date
livie 2dc91356dc Merge some changes from develop-linux 
typo >w>
 2025-12-22 10:54:01 +02:00
Ansariel df94d745c5 Merge branch 'release/2025.07' of https://github.com/secondlife/viewer 2025-09-30 17:27:38 +02:00
Rye 79909b8a33
Fix rendering differences observed in 2025.07 (#4747) 
* Fix calling setTextureAddressModeFast and setTextureFilteringOptionFast with invalid tex type during fast binds

* Restore mRT->screen to GL_RGBA16F to fix lighting banding
 2025-09-29 09:23:29 -07:00
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
Rye 99ce597b54 Fix texture filtering and address mode not updating for vast majority of textures when dirtied 2025-08-22 12:14:15 -04:00
Rye 0f4aa87cac Vectorize LLRender UI scale and offset stack to resolve perf hotspot on arm 2025-02-11 05:04:11 -05:00
Ansariel 215c2d2de0 Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 2024-12-05 23:26:47 +01:00
Dave Parks 37f92c1698
Fix for legacy skies with bright suns not matching FS 6.6.17 (#3214) 2024-12-05 15:10:13 -06:00
Ansariel 193fb1627f Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermedia.cpp
 2024-09-19 23:04:19 +02:00
Andrey Kleshchev 6d842ac0af Expose LLVector4a in LLRender 
Avoid using a bunch of allocators.
Make sure we use LLVector4a's SSE logic instead of LLVector3's.
Some minor optimizations.
 2024-09-19 09:58:17 +03:00
Ansariel d60a55b211 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llrender.cpp
#	indra/llrender/llrender.h
#	indra/llrender/llrender2dutils.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llbadge.cpp
#	indra/llui/llfloater.cpp
#	indra/llui/llstatbar.cpp
#	indra/newview/llbox.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llhudeffectblob.cpp
#	indra/newview/llhudicon.cpp
#	indra/newview/lljoystickbutton.cpp
#	indra/newview/llmanipscale.cpp
#	indra/newview/llmediactrl.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llsnapshotlivepreview.cpp
#	indra/newview/lltoolmorph.cpp
#	indra/newview/llviewerjointattachment.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/pipeline.cpp
 2024-09-18 19:53:18 +02:00
Ansariel Hiller d9da5bbb33
Remove quads rendering mode entirely (#2593) 2024-09-18 17:09:51 +03:00
Ansariel 1cca913ba7 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/CMakeLists.txt
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/llmodelloader.cpp
#	indra/llrender/llgl.h
#	indra/llrender/llrender.h
#	indra/llui/llurlentry.cpp
#	indra/llui/llurlentry.h
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llvoavatar.cpp
 2024-09-13 18:54:12 +02:00
Rye Mutt b713f56d07
Replace glh_linear usage with GLM (#2554) 2024-09-12 11:22:10 -05:00
Ansariel a9b52b1f73 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/llbutton.h
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llscrolllistctrl.h
#	indra/newview/llhudtext.h
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2024-09-04 11:17:13 +02:00
Andrey Kleshchev 4cc0edb189 viewer#2411 Cleanup 2024-09-04 10:16:46 +03:00
Andrey Kleshchev 5c64e5e13d viewer#2411 LLFontGL::render optimizations #3 2024-09-04 10:16:46 +03:00
Andrey Kleshchev 4ae1de1f8a viewer#2411 LLFontGL::render optimizations 2024-09-04 10:16:46 +03:00
Ansariel bea9a8e612 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2024-09-04 00:33:40 +02:00
Rye Mutt 3a73748929 Remove dead texunit colorspace conversion code 2024-08-29 16:32:15 -04:00
Ansariel 3be6763aa0 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/APR.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llface.h
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewerobjectlist.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/viewer_manifest.py
 2024-08-08 21:34:26 +02:00
Alexander Gavriliuk 17f7b439d6 #1922 Make PBR scale and offset crosshair work like Texture crosshair do 2024-08-08 13:40:23 +02:00
Ansariel e9b6550c48 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.cpp
 2024-07-06 11:06:55 +02:00
Dave Parks 08b933a0c6
#1870 Tune up for better experience on integrated intel with low memory (#1872) 
* More deterministic vsize calculation.   Add control for choosing downscale method.
* Quick hack to make GLTF preview work again
 2024-07-03 17:42:24 -05:00
Ansariel 684bc1d1ea Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/llcommon/llsys.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvoicechannel.cpp
#	indra/newview/llvoicechannel.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_sound.xml
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1
 2024-06-21 19:46:51 +02:00
Andrey Kleshchev 148786999d viewer#1698 Uniform being out of range shouldn't crash viewer 2024-06-12 18:12:35 +03:00
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
 2024-05-01 12:30:57 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel 5c93f37775 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llrender.cpp
#	indra/newview/llreflectionmap.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewerwindow.cpp
 2024-03-05 03:31:18 +01:00
Andrey Kleshchev 6c43baf029 Issue #54 LLRender::init crash 2024-03-05 01:58:57 +02:00
Andrey Kleshchev 56a9322569 Issue #54 LLRender::init crash 2024-01-25 01:40:53 +02:00
Ansariel 6c389316f1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llrender/llrender.h
#	indra/newview/VIEWER_VERSION.txt
 2023-10-27 13:00:41 +02:00
Brad Linden 26163e2154 Fix DRTVWR-559 std::array usage in llrender and llprimitive after merge 2023-10-25 16:44:14 -07:00
Ansariel 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
RunitaiLinden 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
Ansariel 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
Jonathan "Geenz" Goodman f4274ba64e Move mipmap generation into LLRenderTarget. 
DRTVWR-583
 2023-04-14 03:08:28 -07:00
Ansariel 5323ccf3b3 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llprofilercategories.h
#	indra/llcommon/lluuid.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/llagent.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexture.cpp
 2023-03-20 11:14:08 +01:00
Dave Parks 25ede86382 SL-19172 Texture streaming tune up. Incidental decruft. 2023-03-10 10:52:35 -06: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
RunitaiLinden 3ef31cb9b2
SL-19203 et al -- Integrate SSR with reflection probes, tweak probe blending. (#63) 
* SL-19203 WIP -- Integrate SSR with reflection probes.  Decruft LLRenderTarget.

* SL-19203 WIP -- Re-integrate SSR.  Incidental decruft.

* SL-19203 WIP -- SSR frame delta correction (still broken for Z)

* SL-19203 WIP -- SSR frame delta Z fix

* SL-19203 WIP -- Make SSR toggleable again and disable SSR in cube snapshots.

* SL-19203 WIP -- Soften sphere probe transitions and fix reflections on void water (make fallback probe a simple terrain+water+sky probe).  Remove parallax correction for automatic probes to reduce artifacts.

* SL-19203 Tune probe blending.

* SL-19203 Cleanup.
 2023-01-27 17:24:22 -06:00
Ansariel b4fde14f09 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llrender.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/llface.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llspatialpartition.h
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 2023-01-19 23:04:50 +01:00
RunitaiLinden 7bd9d21e19
Optimizations, decruft, and intel compatibility pass (#53) 
SL-18869, SL-18772  Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
 2023-01-19 09:13:45 -06:00
Ansariel b3eed96c20 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
#	indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
#	indra/newview/llpanelface.cpp
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llviewershadermgr.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2022-11-16 15:44:33 +01:00
Jonathan Goodman 97277e74a9 Merged in SL-18332 (pull request #1194) 
First pass of Screen Space Reflections

Approved-by: Dave Parks
 2022-11-14 18:12:22 +00: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 9756e0e89e Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llrender.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llface.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerwindow.cpp
 2022-09-17 12:02:14 +02:00
Dave Parks 8dc59e5ef3 SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD 2022-09-16 16:25:26 -05:00
Ansariel 82e545fa92 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-14 09:22:29 +02:00
Dave Parks ff3a28422d SL-17701 WIP -- Parity for point lights between opaque and transparent PBR materials 2022-09-13 17:07:30 -05:00