b1f05340f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/pipeline.cpp
2025-10-11 14:41:58 +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
a41bf0f717
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-09-30 17:27:19 +02: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
24aef9a982
Fix large performance drop when enabling AA on macOS/lower end GPU hardware
2025-08-22 13:12:43 -04:00
f530540d00
Reverting changes to texture pipeline back to stock LL
2025-08-17 17:26:08 +02: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
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
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
ddbe1ff981
Fix xcode16 build errors
2025-02-13 17:30:08 +02: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
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
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
d65fb7cec8
Drop emissive on old Intel GPUs ( #3110 )
...
* #3103 Add the ability to disable the emissive buffer for older GPUs with low memory bandwidth.
* #3135 Add a "vintage" mode for slower GPUs
* #2719 Fix for skies being overbrightened
* #2632 Do not apply tonemapping on legacy skies
2024-11-25 20:56:03 -05:00
1531b28979
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/pipeline.cpp
2024-11-13 11:31:28 +01:00
2b255535ef
2590 mac intel and radeon pro 5300m horrible fps 2 ( #3030 )
...
* OpenGL 3.3 compatibility pass. Fix for FBO driven downscaling corrupting textures.
* Increase maximum texture bias, immediately scale down when textures are loaded higher resolution than desired
* #2590 Fix for some frame stalls on Intel Macs
2024-11-12 15:26:38 -08:00
ef11af28d4
#2637 Revert to the previous alpha analysis to maintain legacy content parity. ( #3061 )
2024-11-08 14:51:19 -05:00
668bf8e52c
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2024-10-22 23:39:09 +02:00
2980f5cacb
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llimagegl.cpp
2024-10-22 23:34:54 +02:00
79aede07e3
FIRE-34374 - additional bypass of LL_ERR
2024-10-22 16:00:33 +01:00
1924c44caf
viewer#2741 Don't reallocate image conversion buffer all the time
2024-10-20 16:48:27 +03:00
a0805bbdb6
FIRE-34374 - OOM fatal error mostly in debug text rendering
...
Make this non-fatal as the majority are in debug text. we are probably out of memory though so crash might just move elsewhere.
LL are investigating further.
2024-10-18 23:59:02 +01:00
82e37d1dfc
Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llmodelpreview.cpp
2024-10-07 10:34:08 +02:00
85b7210fb9
viewer#2741 Sligtly better logging for a crash
2024-10-05 10:08:27 +03: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
b8a0d89dfc
Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llgl.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2024-09-05 01:00:39 +02: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
9573cc8e00
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/es/notifications.xml
# indra/newview/skins/default/xui/fr/notifications.xml
# indra/newview/skins/default/xui/it/notifications.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/pt/notifications.xml
# indra/newview/skins/default/xui/ru/notifications.xml
2024-08-27 19:39:23 +02: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
436e986893
Fix mac crash on startup due to missing types from enum
2024-08-24 00:55:34 -04:00
4a438dcfd4
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
2024-08-23 13:47:48 +02:00
28331b2385
Do deprecated texture swizzle on GPU using GL texture swizzling functions ( #2389 )
...
* Use GL texture swizzling instead of scratch buffer for deprecated formats when GL 3.3 is available
Fix crash when GL texture compression is enabled
* Fix UI font atlas being eligible for texture compression
2024-08-22 10:25:25 -05:00
0e59ed204f
Fix crash on Intel GPUs (or anywhere OpenGL compatibility profile is used). ( #2387 )
2024-08-21 14:36:18 -05:00
db84bf9567
Improve accuracy of texture memory tracking ( #2371 )
...
* Fix alloc_tex_image to account for more missing texture memory
Change alloc_tex_image calls to pass internal format to properly account for used image type
* Fix scaleDown passing primary format in place of internal format to glTexImage2D
* Make texture debug view and texture bias calculation consistent and remove double accounting for render target textures
2024-08-21 09:47:31 -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
Ansariel