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
44fa0c438a
#3696 LLFontFreetype crash when adding glyph
2025-03-11 11:09:59 +02:00
98a96cf033
Revert "tentative workaround for gcc c++20 std::lerp clash"
...
This reverts commit 19999b5858
2025-03-08 23:46:30 +01:00
19999b5858
tentative workaround for gcc c++20 std::lerp clash
...
We may revert this for a better less dispruptive solution if we can find one.
2025-03-08 17:19:19 +00:00
d19e6abc5e
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
# indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
# indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
2025-03-01 01:09:19 +01:00
f40c5b209b
#3597 Fix crash when RenderDebugGLSession is True
2025-02-27 17:07:36 +02:00
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
5b968b7209
#3332 Remake glyph count into cache generation
...
1. Cover reset with 'generation'
2. Fix lapse of judgement with mLastFontGlyphCount, it should have been
saved before render(), not after
2025-02-24 19:31:16 +02:00
8a527d676e
Add restore to mBoostLevel (mPrevBoostLevel) for BOOST_SELECTED interactions
...
Added to the llgltexture a second boost level which will be used to properly restore the boost level after an object is right clicked on as the BOOST_SELECTED code does not restore the value the previous value. This does now and on all the child objects assigned to the object.
Also fixed up the lltextureview.cpp as it had some merge issues from a long time ago and was missed.
2025-02-21 09:45:34 -04:00
fe41087069
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
2025-02-19 15:20:09 +01:00
c60061b504
Switch from GL_RGB16F to GL_R11F_G11F_B10F for probes ( #3562 )
...
* #3561 Switch from GL_RGB16F to GL_R11F_G11F_B10F for reflection probes to help reduce memory bandwidth and VRAM pressure.
2025-02-14 13:16:35 -05:00
5bf1f485f3
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llqueuedthread.cpp
2025-02-13 21:24:29 +01:00
d74b30b4ec
Follow-up fixes from develop
2025-02-13 18:00:55 +02:00
ddbe1ff981
Fix xcode16 build errors
2025-02-13 17:30:08 +02:00
e708d69fb0
#3332 Fix buffers not accounting for dynamic cache values
...
And fix previous lapse of judgement with GLYPH_BATCH_SIZE
2025-02-11 23:59:42 +02:00
d450295cf5
Additional water fixes and tweaks. ( #3524 )
...
* Incorporation of feedback for #3456
2025-02-11 13:49:24 -05:00
6a78b5b43c
#3332 Font issues with multy-byte and multy-glyps characters
2025-02-10 23:18:33 +02:00
3a251b1b9e
#3332 Switching screens can break text rendering
2025-02-07 23:27:30 +02:00
7e7e19ee35
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorymodel.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/pipeline.cpp
2025-02-07 19:38:29 +01:00
93a88e6025
Water Exclusion Surfaces ( #3517 )
...
* #3455 Add support for water exclusion surfaces
2025-02-07 05:55:47 -05:00
41b3ac04b3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-02-03 15:58:57 +01:00
f8e11f738a
Snapshot Frame overlay and composition guides.
...
Initial version of the Snapshot Frame include basic shader to manage the overlay,
integration with main snapshot and flickr floaters.
2025-02-03 02:07:22 +00:00
8758495d11
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/llmath/v4math.h
# indra/llui/lltransutil.cpp
# indra/newview/llface.cpp
# indra/newview/llstartup.cpp
# indra/newview/llvovolume.cpp
2025-01-26 00:07:35 +01:00
d5c6eb92da
Attempt to get more log info in secondlife/viewer#3335 crash reports ( #3470 )
...
when failing to load basic vertex shaders
2025-01-24 11:30:47 -08:00
4763195e18
Fix potential undefined behavior when converting to and from glm types from LLVector3/4 and fall back mul_mat4_vec3 to scalar implementation to attempt crash mitigation ( #3339 )
2025-01-23 18:40:19 -05:00
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
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
926c22e1b9
Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llfontfreetype.cpp
# indra/newview/llstartup.cpp
2025-01-07 13:56:32 +01:00
12303e21c9
#3347 Crashes in LLFontFreetype::renderGlyph
...
Try to handle this more gracefully, but primary purpose of this change
is to log wchars in case issue is reproducible.
2025-01-07 03:21:36 +02:00
10a1ba81ce
Minor resource tracking fix
2025-01-04 01:08:51 +00:00
6df1b5b049
FIRE-34483 - Speedup graphics setting change and previews etc
...
On average adjust settings now takes 20% of the time it used to, ymmv!
RenderTarget allocate is called repeatedly when nothing has changed. So stop doing that.
2025-01-04 01:08:51 +00:00
2dab059997
Where did this tab come from?
2024-12-20 12:53:10 +01:00
c753c19231
Remove duplicate check
2024-12-19 00:01:43 +01:00
b15fb708e3
Merge branch 'main' of https://github.com/secondlife/viewer
2024-12-19 00:00:01 +01:00
a66ec26b81
#3295 Crash scaling texture down ( #3296 )
2024-12-16 22:21:42 +00:00
6c5bd86d0e
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-extrafps
2024-12-15 21:45:16 +01:00
c53bc7e74f
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llviewercontrol.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2024-12-15 21:44:14 +01:00
935930cc21
Avoid crash for uninitialised GLImage internal format (-1)
2024-12-15 20:44:00 +00:00
67b9779d55
Merge pull request #3262 from secondlife/rye/extra-mesafix
...
Fix mesa failing to link shaders due to missing vertex shader outputs
2024-12-13 16:01:44 -08:00
eff46262c8
#2590 Radeon mac optimization pass ( #3277 )
...
- Skip updating of reflection probes that are not the default probe when probe coverage is set to "None"
- enable RenderAppleUseMultGL and disable occlusion culling on Macs with AMD GPUs
- Reduce the number of texture decode threads on Macs with intel cpus.
- Move texture deletion to LLImageGL::updateClass and prevent textures from staying resident in vram longer than 3 frames
- Disable SSAO by default on Macs with intel CPUs
2024-12-12 15:46:01 -06:00
f8fad89dd0
Fix mesa failing to link shaders due to missing vertex shader outputs
2024-12-11 08:49:38 -08:00
586d0a3247
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/skins/default/xui/en/notifications.xml
2024-12-11 17:47:28 +01:00
Ansariel