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
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
f530540d00
Reverting changes to texture pipeline back to stock LL
2025-08-17 17:26:08 +02:00
d362e4ed8f
Cleaned up comments (incorrect comment from JIRA title)
2025-04-22 16:54:35 -03:00
3f6102bc06
Hide and restore GLTF material depending if on the BP or PBR tab to fix visual issues.
2025-04-18 20:25:25 +10:00
52cca995cc
Merge branch 'release/2025.04' into rye/forevermac
2025-04-15 13:55:01 -04: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
e1d6b57733
#3798 Crash at getAvatar()
2025-03-25 07:46:01 +02:00
2802475f05
FIRE-35081 - Fix crash on load
...
Reverted added code for the LLFace::switchTexture to update the texture being passed in to use the existing texture boost and max virtual size as the mTexture[ch] may be NULL or invalid due to being deleted.
2025-03-24 07:22:53 -03: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
0a4601b764
Added 2 minor fixes for LLFace
...
Added init value for mCloseToCmera for LLFace
Changed mCloseToCamera assignment from True to 1.0f (It was a bool at one point) in LLFace
2025-03-11 23:51:23 -03:00
5b0801e535
[FIRE-35081] - Fixed blurry textures and scaling issues
...
Added new calculation to the LLCamera for draw distance multiplier
Removed the Inverse aspect as not longer used
Modified the LLFace to no long user the inverse aspect.
Updated mInFrustum to use mImportanceToCamera as it was correct
LLViewerCamera removed the mCosCameraFOV (not used anymore)
Added LLViewerMenu option under Developer->Dump->Texture List to dump texture list to info for debugging.
LLViewerTexture viewer for LOD textures, now loops to make the texture fit to cover the max discard value instead of calculating with logs and divisions.
LLViewerTextureList updated to to dump texture list to the Infos, and updated to boost for not only textures based upon the importance to the camera, but to boost a second time for textures close to the camera. Also capped the mMaxVirtualSize to try to help track down texture size changes
Updated LLPipeline to use same getDrawDistanceMultiplier as the texture calcPixelArea code.
2025-03-12 00:32:16 +00:00
c64a294cf1
Fixed up animations to always be running (Frustum may need revision
...
Fixed up animations to always be running, so they should not stutter or be in odd places when turning the camera.
May need to revise the mInFrustum as trying to make sure it's within the actual visual location. Need to test with
2025-03-12 00:32:16 +00:00
9b060f7fcc
Fix deprecation warnings under C++20 on MSVC
2025-02-11 05:04:11 -05: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
5af750a130
#3450 Crash at LLViewerMediaTexture::setPlaying
2025-01-22 16:06:30 +02:00
68d82c9793
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lltexturefetch.cpp
# indra/newview/viewer_manifest.py
2024-11-27 19:23:33 +01:00
97f0a21421
viewer#3131 crash in updateRiggingInfo
2024-11-22 20:58:50 +02:00
b727a5e73c
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llglsandbox.cpp
# indra/newview/llphysicsshapebuilderutil.cpp
2024-09-19 01:25:26 +02:00
b31fd167c0
Fix for particles not loading textures ( #2598 )
...
Also fix assert while prepping GLTF assets
2024-09-18 15:23:20 -05:00
44ccbea344
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/character/avatar_lad.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llface.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvoavatar.cpp
2024-09-17 18:12:46 +02:00
486613e79b
Profile guided optimization pass ( #2582 )
...
- Tune up LLJointRiggingInfoTab
- Visualize joint bounding boxes when visualizing joints
- Use LLJointRiggingInfo to caclulate desired resolution of a texture
- Throttle calls to calcPixelArea
- Fetch MeshSkinInfo immediately when header is received
2024-09-16 18:49:03 -05:00
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
b713f56d07
Replace glh_linear usage with GLM ( #2554 )
2024-09-12 11:22:10 -05:00
a592823ec6
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llvovolume.cpp
2024-09-11 12:06:41 +02:00
cde5d29faf
Profile guided optimizations
2024-09-10 18:27:45 -05:00
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
ecf3002a46
Merge remote-tracking branch 'origin/release/2024.08-DeltaFPS' into develop
2024-08-29 13:32:34 -07:00
b0fefd62ad
#2428 Fix for crash when applying PBR material to a single face (take 2) ( #2463 )
...
Also fix for some objects randomly disappearing until they're selected again.
2024-08-29 15:06:24 -05:00
1f58884db9
#2438 Address frame stalls in updateImageDecodePriority
2024-08-28 13:14:58 -05:00
8406d1052c
#2428 Fix for crash when applying PBR material ( #2430 )
...
Also attempt to fix some occasional bad texture memory tracking.
2024-08-27 09:53:54 -07:00
033fd2e476
Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/llcommon/llmemory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
2024-08-27 18:33:30 +02:00
ef916bd3ae
Remove or suppress left over debug messages in hot paths ( #2392 )
2024-08-26 16:32:22 -07:00
0edf6e230e
#2388 Texture downrezzing tune up. ( #2414 )
...
- Hold onto unreferenced textures for 30 seconds.
- Don't downres unless memory is low
- Downres when viewer is backgrounded.
2024-08-23 16:35:52 -05:00
830eeaa6ff
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llface.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewertexturelist.cpp
2024-08-21 00:46:46 +02:00
ed6732eda8
#2315 Ensure textures are deleted when they are no longer referenced. ( #2343 )
...
* #2315 WIP -- Clean up deletion rules in texture list. Incidental decruft.
* Touch up assertions.
* Move mLastReferencedTimer to LLViewerMediaTexture since it's no longer used by LLViewerTexture
2024-08-20 06:59:07 -05:00
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
17f7b439d6
#1922 Make PBR scale and offset crosshair work like Texture crosshair do
2024-08-08 13:40:23 +02:00
cb43c1c792
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
2024-07-10 12:36:15 +02:00
2a7030992f
Update tracy profiler to 0.10 ( #1946 )
2024-07-09 16:53:43 -05:00
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
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
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
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
15b3c9f164
Fix a few merge issues
2024-06-13 02:22:03 +02:00
c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02:00
18903f6cac
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 19:04:21 +02:00
Ansariel