summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
AgeCommit message (Collapse)Author
2024-05-15Merge branch 'main' into marchcat/x-mf-mergeAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterimagepreview.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-26Merge pull request #1337 from secondlife/v-1184cosmic-linden
Cached minimap textures still using extra memory/loading still not reliable
2024-04-26secondlife/viewer#1184: Remove logspamCosmic Linden
2024-04-25secondlife/viewer#1184: Use more robust/memory-friendly setLoadedCallback ↵Cosmic Linden
for minimap gen. Fix some emissive maps.
2024-04-24Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-04-24Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
2024-03-19secondlife/viewer-issues#82: Don't allow transparent texture terrainCosmic Linden
2024-01-12SL-20799 FIXED Viewer crashes when trying to save snapshot on disc without ↵Maxim Nikolenko
empty space
2024-01-09SL-20779 More reliable decode and encode error logging (#615)Andrey Kleshchev
2023-10-13DRTVWR-592: Fix broken minimap loading, improve minimap view of PBR ↵Cosmic Linden
materials (still not accurate, but better...)
2023-10-13DRTVWR-592: Allow using RGBA textures for terrain, as the texture uploader ↵Cosmic Linden
does not consolidate opaque textures
2022-12-16SL-18861 Optimize away alpha channel on GLTF material imports.Dave Parks
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-06-16SL-17619 Add support for embedded textures to GLTF importerDave Parks
2022-03-11SL-17005 WIP Simplify what feeds texture loading bias to only pay attention ↵Dave Parks
to available memory according to OS and GL driver, not (broken) internal accounting (breaks intel GPUs, compatibility pass incoming).
2022-03-07SL-16933: Fix texture stat Raw Total always increasingPtolemy
2022-02-14SL-16418 Media texture update stall fix. Make media texture updates use ↵Dave Parks
LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-01Revert "Merged in euclid-16418 (pull request #846)"Dave Houlton
This reverts commit 40fe5277e1390c975d9a3184ff8fc46d69dfb450, reversing changes made to af830e5fc5840194be95140f644a27011b9b7e06.
2022-01-28SL-16418 add some big-endian future-proofingDave Houlton
2022-01-27SL-16418 rename media tex image per-update to avoid contention stallDave Houlton
2022-01-27SL-16418 optimize imageraw clearDave Houlton
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-08-09SL-15788 Crash throw_std_bad_alloc in LLImageRaw's scaleAndrey Kleshchev
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-05-29SL-13348 Thread crashing singleton #2Andrey Kleshchev
Reverted LLImage to singleton conversion
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-05SL-10908 One more safeguardandreykproductengine
2019-07-25DRTVWR-493 LLImage to LLParamSingletonandreykproductengine
2019-01-14SL-10291 Replace apr_mutex with standard C++11 functionalityandreykproductengine
2018-07-26MAINT-8923 Better allocation failure handling, createGLTexture crashesandreykproductengine
2018-01-30MAINT-8091 Removed deprecated and unused private memory poolingAndrey Kleshchev
2018-01-17Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-11-27MAINT-8028 Fixed memory leak in allocateDataSize()andreykproductengine
2017-10-27Merged from viewer-lynxandreykproductengine
2017-10-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-06-06[SL-711] - Eliminate some overheads in texturecache.ruslantproductengine
- Eliminate memory overhead when need duplicated scaled image. - Small improvement in LLImageBase::getCodecFromExtension()
2016-12-08MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()AndreyL ProductEngine
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-19MAINT-6818 Fix for LLImageBase::allocateData crashAndreyL ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 17:28:29 +0000