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

170 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
Beq 7a0168c931 Add texture cache monitor to the texture view 
shows used vs max.
 2024-01-07 21:07:51 +00:00
Ansariel 682535dd16 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/llcommon/stdtypes.h
 2023-07-19 10:27:16 +02:00
Brad Linden ae63ed51aa Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292) 2023-07-18 14:38:18 -07:00
Nat Goodspeed b61ea595b5 SL-18837: Clean up more set-but-unused variables for Xcode 14.3 2023-05-19 17:33:27 -04: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 7f9d028fe4 Fix incorrect VRAM usage in textureview 2022-09-17 13:30:01 +02:00
Ansariel 3f44c70c34 Revert "SL-17723 Remove use of UDP image fetch" and restore OpenSim compatibility 
This reverts commit 5f8f4754ab.
 2022-09-17 12:47:44 +02: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
Mnikolenko Productengine c0b586a7e1 SL-17723 Remove use of UDP image fetch 2022-09-16 23:27:54 +03:00
Ansariel 578ba7880c Add debug setting (FSMaxTexMemory) to limit the max amount texture memory used 2022-09-04 13:56:12 +02:00
Mnikolenko Productengine 5f8f4754ab SL-17723 Remove use of UDP image fetch 2022-07-13 17:22:01 +03:00
Ansariel 100e2d5d4e Remove some commented out stuff 2022-06-03 15:09:12 +02:00
Ansariel c5d9c3c2a7 Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Tracy.cmake
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llimagegl.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable_mac.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
#	indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
 2022-06-03 15:07:06 +02:00
Dave Parks b6841d75c2 SL-17219 WIP - Texture pipeline overhaul 2022-04-15 19:02:07 -05:00
Dave Parks e60024f0af SL-17005 WIP - Use D3D/DXGI to query for available VRAM on Windows 2022-03-29 15:41:00 -05:00
Dave Parks 34e79c8f4e SL-17005 WIP Simplify what feeds texture loading bias to only pay attention to available memory according to OS and GL driver, not (broken) internal accounting (breaks intel GPUs, compatibility pass incoming). 2022-03-11 10:21:08 -06:00
Ansariel 63c8280325 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-03-08 16:20:47 +01:00
Dave Parks 2b2a5da099 SL-16972 Fix for blurry textures when "running out" of system memory. 2022-03-07 17:16:29 -06:00
Dave Parks cad73f2403 SL-16972 Add free vram to texture console to rule out low vram for blurry textures. 2022-03-07 15:48:09 -06:00
Ansariel 2a1689d066 Rely on LLImageGLThread::getFreeVRAMMegabytes() to determine available VRAM 2022-02-22 15:01:38 +01:00
Ansariel a0be0371d7 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 01:12:13 +01:00
Andrey Kleshchev 5e7a0a963e SL-14190 moved sAvatarDictionary 2020-11-03 22:12:39 +02:00
Ansariel 561d90147c Use unique state codes in texture console from DRTVWR-458 2020-10-24 00:58:42 +02:00
Ansariel 068ca4c136 Display approximate VRAM usage in texture console - unless it's an Intel GPU of course... 2020-10-24 00:48:56 +02:00
Ansariel c84e015a44 Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer 2020-07-01 16:08:56 +02:00
Ptolemy 528a4bc6a1 DRTVWR-497: Fix Texture Console flicker on first line 2020-06-29 11:54:46 -07:00
Ansariel d2963a5e60 Merge viewer-cougar 2018-07-11 20:48:32 +02:00
Graham Linden 0aa2e5b1a3 Replace cache hit info in tex fetch debug display. 
Silence launcher warning for devs.

Work-around path gen deciding to gen NaNs for some flexi prims.
 2018-06-28 19:30:19 +01:00
Ansariel fa46b5495c Merge viewer-lynx 2018-04-07 12:06:15 +02:00
AndreyL ProductEngine 94587717b2 Merged in lindenlab/viewer-release 2018-04-04 21:08:13 +03:00
Nat Goodspeed f82548b931 MAINT-8474: Xcode 9.3 insists that comparators use const operator(). 2018-03-31 10:59:39 -04:00
Ansariel bcb8dcee52 Merge viewer-neko 2018-03-13 19:48:24 +01:00
Andrey Kleshchev 4156fb832c MAINT-6363 Normal and specular maps should not be downloaded if ALM is off 2018-03-06 12:59:32 +00:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 546b276eba Fix merge issue 2015-01-18 17:18:23 +01:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
simon 518cc86156 Merge viewer-release and become version 3.7.15 2014-08-20 16:31:34 -07:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
Monty Brandenberg d16e1b1b55 Post-merge cleanup. In onCompleted() restore the unconditional 
use of setGetStatus() in case the baked texture service changes
introduced some sort of hidden (and wrong) dependency.  Left
out the ridiculous duplicated invocation inside that failure status
block.  Someone damaged texture console again and apparently didn't
even bother to look at their work.  I'm sure they documented
their changes on the public wiki as well.  Unified the logging
tag throughout lltexturefetch.cpp.  Only way to get the cut-n-
pasters to do the right thing.
 2014-06-17 13:18:50 -04:00
Tank_Master f57495440f move "BW:" info up a line in texture console so its not behind other info 2014-09-23 00:15:18 -07:00
Richard Linden d13b0a299e MAINT-3950 FIXED can't open lag meter 
brought back llfloaterlagmeter from the dead, and ported to lltrace
 2014-05-20 14:07:23 -07:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Nicky 2b8cc81ff5 Get all those new LLUnits play nicely with each other. 2014-06-10 16:11:24 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Brad Payne (Vir Linden) 895d52a399 merge viewer-release to sunshine-external 2014-02-25 13:25:40 -05:00
Richard Linden 80b4a4a1f5 merge with release 2014-02-24 18:45:59 -08:00
Ansariel 5f6713ebdb Fixed texture memory bars in texture console 2014-02-13 21:07:30 +01:00