06e8393846
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-16 22:48:43 +02:00
2ef2233afa
FIRE-36016 - Re-added Store/Restore boost levels of selected objects
...
Re-adding the feature to store and restore texture boost levels when a user edit's an object.
When you right click on an object. All the textures assigned to it get their boost level set to BOOST_SELECTED.
For LOD textures, once the texture's ProcessStats is completed, it resets the boost level to BOOST_NONE. This can cause the texture to then be subject to Texture Bias when in low memory, where before it was possibly protected as being a higher priority texture.
Now when the boost levels is about to change to BOOST_SELECTED, it gets stored and in ProcessStats, the boost level is restored.
Issue was fixed before but was rolled back. This is just restoring this one fix.
2025-10-13 21:04:25 -03:00
3b33e548f4
[FIRE-35342] Fix frame guide rendering inside the scene
...
Add UI for controlling the settings, add new styles.
Snapshot guide with golden ratio options
Adds golden ratio composition guides to the snapshot tool, including options for different orientations (top-left, top-right, bottom-left, bottom-right).
Also refactors the snapshot guide settings into a separate floater for better organization.
2025-10-13 20:10:48 +01:00
98a48cf1c1
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/pipeline.cpp
2025-10-11 14:35:54 +02:00
9d1f00968e
Revert "Make snapshot guides more visible"
...
This reverts commit c1c6f1ed5e
2025-10-10 08:59:40 +02:00
9267076ebb
Make the visibility/opacity of the composition guides in snapshot view configurable via debug setting, as per request
2025-10-10 08:19:01 +02:00
56cb655fbe
#4773 Crash on sub_image_lines (FS:TJ- Follow-up cherry-pick to fix out of bounds discard_levels)
...
Just caught it and discard_level is somehow 7, which seems like it resulted in src going out of bounds, which crashed glTexSubImage2D
2025-10-07 19:50:37 +10:00
a12e38911e
Use llmin instead of llmax to correctly clamp mMaxDiscardLevel
2025-10-02 02:26:29 +10:00
49caa5e179
#4758 Extra logging to track discard 6
...
Plus clamped some values and preventing decode from starting
# Conflicts:
# indra/newview/llviewertexture.cpp
2025-10-02 01:33:20 +10:00
b8bc108ea7
Partial restore of texture pipeline changes to address texture discard issues
2025-10-02 01:23:36 +10:00
df94d745c5
Merge branch 'release/2025.07' of https://github.com/secondlife/viewer
2025-09-30 17:27:38 +02:00
a41bf0f717
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-09-30 17:27:19 +02:00
3665dc24f4
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm into texture-changes-reverted
2025-09-30 16:38:47 +02:00
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
efe97b9940
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/cmake/00-Common.cmake
# scripts/packages-formatter.py
2025-09-09 19:52:09 +02:00
9bde3ecb89
More set but unused fun
2025-09-09 09:26:37 +01:00
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
a601715860
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/installers/windows/installer_template.nsi
2025-09-03 19:45:39 +02:00
90aa693f2a
Merge Changes for support of apple silicon on macOS
...
Mac Arm
2025-09-03 20:30:12 +03:00
46f325b7db
#4587 Make shader cache reading faster
2025-09-02 23:29:15 +03:00
3ea1d87a42
#4587 Shaders sometimes do not match the shader settings
...
Ensure versions get matched reliably
2025-09-02 23:29:15 +03:00
24aef9a982
Fix large performance drop when enabling AA on macOS/lower end GPU hardware
2025-08-22 13:12:43 -04:00
99ce597b54
Fix texture filtering and address mode not updating for vast majority of textures when dirtied
2025-08-22 12:14:15 -04:00
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04:00
f530540d00
Reverting changes to texture pipeline back to stock LL
2025-08-17 17:26:08 +02:00
b0b8328c5c
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llrendertarget.cpp
# indra/newview/gltf/asset.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoicewebrtc.cpp
# indra/newview/viewer_manifest.py
2025-08-12 22:50:51 +02:00
f03cd219a9
Fix clang compiler issues due to unused variables
2025-08-12 14:09:53 +00:00
dc409c4f64
Unused variable flagged by MacOS.
...
The entire switch block has no use.
2025-08-10 10:27:18 +01:00
bfd99549b0
Merge branch 'release/2025.05' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/pull_request_template.md
# indra/llappearance/lltexlayer.cpp
# indra/llcommon/llthread.cpp
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/lldaeloader.h
# indra/llprimitive/llmodel.cpp
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llmodelpreview.cpp
# indra/newview/lltoolpie.cpp
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
2025-07-18 14:14:54 +02:00
3da493295e
#4296 Crash at renderMorphMasks
2025-07-09 23:16:17 +03:00
12f5023de5
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-05-09 19:26:27 +02:00
963ca99919
FIRE-34655 - Linux VRAM detection failing
...
Partial solution that should bring Nvidia and AMD detection back in line with other platforms.
2025-05-08 21:12:55 +01:00
3d61db550d
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/qatest.yaml
# indra/newview/skins/default/xui/en/notifications.xml
2025-05-03 13:26:46 +02:00
d9e55c4415
#3997 Crash in a gltf asset enabled region
2025-04-29 18:12:57 +03:00
cf2f48de06
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
2025-04-26 00:31:04 +02:00
9d6c74a051
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-04-25 22:21:12 +02:00
120f85c9e0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvieweraudio.cpp
# indra/newview/llvoavatar.h
2025-04-25 22:20:59 +02:00
d362e4ed8f
Cleaned up comments (incorrect comment from JIRA title)
2025-04-22 16:54:35 -03:00
f6219fecc3
#3696 Crash at LLFontFreetype::addGlyphFromFont
2025-04-18 19:49:32 +03:00
abedabebac
Fix issue of 2K textures not scaling down when off screen [FIRE-35361] side effect
...
Now that 2K textures are loading correctly an issue came up.
mMaxDiscardLevel could be set to 6 (from discard_level) with 2K textures which is above the current MAX_DISCARD_LEVEL.
The side effect was the texture to not scale down due to the checks on it as well as the mFetchTexture code would also not process the texture if the discard level is above the MAX_DISCARD_LEVEL.
2025-04-18 06:58:48 -03:00
52cca995cc
Merge branch 'release/2025.04' into rye/forevermac
2025-04-15 13:55:01 -04:00
6487febff0
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/lldxhardware.cpp
# indra/llwindow/lldxhardware.h
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerdisplay.cpp
2025-04-10 18:50:12 +02:00
2da46c3830
#3575 Clean up obsolete VRAM detectin logic
2025-04-05 09:28:26 +03:00
beb3ff3d36
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llviewerparcelmgr.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.h
2025-04-04 12:46:39 +02:00
d77954ef50
#3597 Improve error handling at LLGLSLShader::disableTexture()
2025-04-02 16:18:33 +03:00
99e1699479
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llwearable.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
2025-03-27 19:36:45 +01:00
5e5d466628
Readd probe count setting ( #3793 )
...
* Readd max probe count. Disable dynamic probe allocation by default (for now).
2025-03-24 17:59:13 -04:00
b140406910
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-03-23 11:46:47 +01:00
c082f0cd76
FIRE-35081 - Handled animated/media textures, grass, tree and light textures
...
Added new boost levels for Tree, Grass and Light textures (More for tracking as they have custom hard coded values for the mPixelArea which causes issues with loading of sizes.
Added adjustments for the calcPixelArea and calcImportanceToCamera as well as getTextureVirtualSize
Added virtual texture size updates for Media textures
Added code to scale down off screen textures (saves a lot of texture VRAM.
Added additional features for the LLViewerTextureList::Dump
Only issue is server controlled textures which animate tend to load low quality, then upscale as well as Sculpted Volume's which force textures to reload.
2025-03-17 23:13:41 -03:00
750099db68
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/llproxy.cpp
# indra/llui/llfolderviewitem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llviewerprecompiledheaders.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/viewer_manifest.py
2025-03-12 19:31:51 +01:00
Ansariel