summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
AgeCommit message (Collapse)Author
6 daysMerge branch 'main' into marchcat/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
10 daysFix merge issues:Ansariel
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors # Conflicts: # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llui/llfolderviewitem.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llvoavatar.cpp
11 daysMerge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp
2025-03-21Dynamic Probe Allocation (#3787)Jonathan "Geenz" Goodman
* #3788 Support dynamic probe allocation. * #3738 Mitigate probe flashing * #3735 Mitigate realtime probes flashing
2025-03-21#3364 Fix a case of excessive texture updatesAndrey Kleshchev
when bias fluctuates a bit. Make bias' effect a bit more gradual.
2025-03-05Add RenderTextureVRAMDivisor (#3648)Jonathan "Geenz" Goodman
#3647 Add texture VRAM use divisor.
2025-02-03Fix media failing to function on PBR materials (#3445)Rye
2025-01-23Small cleanupAndrey Kleshchev
2025-01-22#3450 Crash at LLViewerMediaTexture::setPlayingAndrey Kleshchev
2025-01-21#3371 Texture resolution cap #2Andrey Kleshchev
2025-01-21#3371 Texture resolution capAndrey Kleshchev
2025-01-16#3364 Fix update rate being stuck high due to biasAndrey Kleshchev
if bias stays unchanged at 4.f, there is no reason to keep refreshing at high rate.
2025-01-11#3364 Decrement bias only if there is 10prcnt free spaceAndrey Kleshchev
Instead of when there is any space.
2024-12-06Remove unwanted notification for texture downrezing behavior (#3233)Brad Linden
secondlife/viewer#2549
2024-12-05#3210 Fix for "Texture will be downscaled" happening too often. (#3212)Dave Parks
2024-12-04#3106 Lower maximum texture bias back to 4, reintroduce camera importance ↵Dave Parks
texture scaling (#3207)
2024-12-03#3093 #3055 World Map tiles are blurry #2Andrey Kleshchev
2024-11-27viewer#3147 Thumbnail picker's image is grey #2Andrey Kleshchev
Apparently made a blunder in previous commit since I missed mFetchState being reset each run
2024-11-27viewer#3147 Thumbnail picker's image is greyAndrey Kleshchev
when both thumnail and normal image attempt to fetch, one creates a fetcher, another fails, since fetcher is already there, potentially in a transitional state, so it thinks fetch failed.
2024-11-22viewer#3055 Fix texture fetch being stuckAndrey Kleshchev
destroyRawImage is the only function that calls saveRawImage(), not calling it results in fetcher thinking that it still needs data to do the saving and looping back to trying to fetch.
2024-11-20#3093 World Map tiles are blurryMaxim Nikolenko
2024-11-122590 mac intel and radeon pro 5300m horrible fps 2 (#3030)Dave Parks
* 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-10-31viewer#2653 LOD textures weren't taking callback discard into accountAndrey Kleshchev
2024-10-29Merge brad/2549-downrez-controls into release/2024.09-ExtraFPS (#2864)Brad Linden
2024-10-29Fix texture discard bias not incrementing correctly due to being limited by ↵Rye
frame interval and a timer at the same time
2024-10-29Add handling for downrezzing textures when viewer is minimized, fix ↵Rye
downrezzing textures when minimized due to texture system not processesing
2024-10-25viewer#2875 Proportionally agressive vram cleanupAndrey Kleshchev
2024-10-15Provide affordances to disable automatic downrezing of textures when SL is ↵Brad Linden
in background secondlife/viewer#2549
2024-09-27viewer#2653 fix texture readback not being called and not setting values ↵Andrey Kleshchev
properly Ex: Saving textures to hard drive sometimes fails
2024-09-10Profile guided optimizationsRunitaiLinden
2024-09-09Merge pull request #2530 from secondlife/release/2024.08-DeltaFPSBrad Linden
Release/2024.08 delta fps
2024-09-06#2467 Fix for sim surrounds not fully loading (#2524)Dave Parks
Also fixes some sculpts getting wrong LoD
2024-09-04Merge remote-tracking branch 'origin/release/2024.08-DeltaFPS' into developBrad Linden
2024-09-04#2482 Low end NVIDIA compatibility pass (#2486)Dave Parks
- Use GL_NVX_gpu_memory_info when available - Disable transparent water on Mid+ and lower - Adjust GPU benchmark to better tell the truth - Texture bias tune up - viewer-private/#277 - Report foreground_time in viewer stats
2024-08-27#2431 Fix for redundant searching for pixeismall.j2c causing frame stallsRunitaiLinden
2024-08-26Merge remote-tracking branch 'origin/release/2024.08-DeltaFPS' into developBrad Linden
2024-08-23#2388 Texture downrezzing tune up. (#2414)Dave Parks
- Hold onto unreferenced textures for 30 seconds. - Don't downres unless memory is low - Downres when viewer is backgrounded.
2024-08-21Improve accuracy of texture memory tracking (#2371)Rye Mutt
* 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-20Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into developBrad Linden
# Conflicts: # autobuild.xml # indra/newview/llvoicewebrtc.cpp
2024-08-20#2315 Ensure textures are deleted when they are no longer referenced. (#2343)Dave Parks
* #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-15Merge remote-tracking branch 'origin/release/webrtc-voice' into ↵Brad Linden
release/2024.06-atlasaurus # Conflicts: # indra/newview/llpanelpeople.cpp
2024-08-15#2307 BugSplat Crash #1504734: LLViewerTexture::getNumFaces()Alexander Gavriliuk
2024-08-13Merge pull request #2210 from secondlife/v-1883cosmic-linden
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
2024-08-06secondlife/viewer#1883: Local-only PBR terrain paintmap with developer toolsCosmic Linden
2024-08-02Crash at LLViewerTexture::updateClass()Andrey Kleshchev
2024-07-10Remove orphaned constants gMinVideoRam and gMaxVideoRam (#1970)Ansariel Hiller
2024-07-09#1943 make sys free in texture console llmemorysavailphysicalmeminkb tell ↵Dave Parks
the truth (#1966) * Also fix for crash when applying MoaP to PBR material
2024-07-08Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h ↵Ansariel
and llunittype.h for now
2024-07-03#1870 Tune up for better experience on integrated intel with low memory (#1872)Dave Parks
* More deterministic vsize calculation. Add control for choosing downscale method. * Quick hack to make GLTF preview work again
2024-06-271836 dont store texture in system memory unless absolutely necessary (#1843)Dave Parks
* #1836 Texture memory usage overhaul. Much decrufting - don't keep a copy of textures in system memory - use GPU to downrez textures instead of reloading from cache - use GPU to generate brightness/darkness bumpmaps
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 07:18:14 +0000