summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
AgeCommit message (Collapse)Author
2013-08-19MergeXiaohong Bao
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-18SH-4297 WIP interesting: viewer-interesting starts loading cached scene lateRichard Linden
dependency cleanup - removed a lot of unecessary includes
2013-07-01BUILDFIX: reverted changes that attempted to automate mem trackRichard Linden
stat definition as they don't work on gcc/clang
2013-07-01SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%Richard Linden
also, removed LLTrace::init and cleanup removed derived class implementation of memory stat for LLMemTrackable is automatic now
2013-06-05merge with viewer-releaseRichard Linden
2013-06-04SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
fixed mem stat tracking...now properly tracks memory footprint with floating point precision cleaned up macros for unit declaration renamed units to SI standard for 1024 multiples (kibibytes, etc) fixed units output for scene monitor dump
2013-05-09Merge viewer-betasimon
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Forgot to commit @#! mergesimon
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-22merge with viewer-releaseRichard Linden
2013-03-06renamed LLTrace stat gathering classes/methods to make the structure of ↵Richard Linden
LLTrace clearer Count becomes CountStatHandle Count.sum becomes sum(Count, value), etc.
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
further compile error fixes
2013-01-04SH-3468 WIP add memory tracking base classRichard Linden
attempted fix for gcc compile errors can't use typeid() on a class that doesn't have a method defined in a translation unit fix is to force classes deriving from LLMemTrackable to use their own static member named sMemStat
2013-01-03fix for MAINT-2147: crash in LLTextureCache::writeToFastCache on OSXXiaohong Bao
2012-12-18Fix for alpha blending using gl fixed-functions not matching shader ↵Don Kjer
implementation
2012-12-18SH-3468 WIP add memory tracking base classRichard Linden
created memory tracking trace type instrumented a few classes with memory tracking
2012-11-19merge with viewer-developmentRichard Linden
2012-10-16Pull back viewer-development with latest beta mergessimon@Simon-PC.lindenlab.com
2012-10-16pull back changes from 3.4.1-beta8Oz Linden
2012-10-15MAINT-1721 Fix for crash when clicking "back" button after editing appearance.Dave Parks
Reviewed by VoidPointer
2012-09-06Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-06-12for SH-3073: implement a fast cache system for texture fetchingXiaohong Bao
2012-04-12SH-3080 : Implement the TextureReverseByteRange setting so we can play with ↵Merov Linden
that parameter
2012-04-05SH-3060 : Implement new byte range computation, cleaned up use of ↵Merov Linden
compression rate as well.
2012-04-04SH-3060 : New byte range implementation. Intermediate (not working) state.Merov Linden
2012-04-02SH-3060 : Preliminary implementation of the new byte range computation, ↵Merov Linden
implement setting to turn it on or off
2012-03-15SH-3047 : Add a load_size argument to llimage_libtest and allow partial ↵Merov Linden
image file to be loaded.
2012-03-15SH-3047 : Read the number of levels from the j2c image header instead of ↵Merov Linden
relying on hacked computation based on width / height.
2011-11-30trivial: change a log info for memory failure for LLImageBaseXiaohong Bao
2011-10-14Merge backout of b782a75c99e6Dave Parks
2011-10-14Backed out changeset b782a75c99e6Dave Parks
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-05-10add debug mode to track the memory allocation/deallocation.Xiaohong Bao
2011-04-13EXP-669 : Refactor code to use correct LLImageFormatted methods to load ↵Merov Linden
images of all formats, reviewed by richard
2011-02-24fix the compiling error: "free" is defined and in use globally.Xiaohong Bao
2011-02-23add types to LLPrivateMemoryPoolXiaohong Bao
2011-02-23MergeXiaohong Bao
2011-02-23Automated merge with ssh://hg.lindenlab.com/bao/private-memory-poolXiaohong Bao
2011-02-23Merge from viewer-developmentXiaohong Bao
2011-02-05Introduces a LLThreadLocalData class that can beAleric Inglewood
accessed through the static LLThread::tldata(). Currently this object contains two (public) thread-local objects: a LLAPRRootPool and a LLVolatileAPRPool. The first is the general memory pool used by this thread (and this thread alone), while the second is intended for short lived memory allocations (needed for APR). The advantages of not mixing those two is that the latter is used most frequently, and as a result of it's nature can be destroyed and reconstructed on a "regular" basis. This patch adds LLAPRPool (completely replacing the old one), which is a wrapper around apr_pool_t* and has complete thread-safity checking. Whenever an apr call requires memory for some resource, a memory pool in the form of an LLAPRPool object can be created with the same life-time as this resource; assuring clean up of the memory no sooner, but also not much later than the life-time of the resource that needs the memory. Many, many function calls and constructors had the pool parameter simply removed (it is no longer the concern of the developer, if you don't write code that actually does an libapr call then you are no longer bothered with memory pools at all). However, I kept the notion of short-lived and long-lived allocations alive (see my remark in the jira here: https://jira.secondlife.com/browse/STORM-864?focusedCommentId=235356&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-235356 which requires that the LLAPRFile API needs to allow the user to specify how long they think a file will stay open. By choosing 'short_lived' as default for the constructor that immediately opens a file, the number of instances where this needs to be specified is drastically reduced however (obviously, any automatic LLAPRFile is short lived). *** Addressed Boroondas remarks in https://codereview.secondlife.com/r/99/ regarding (doxygen) comments. This patch effectively only changes comments. Includes some 'merge' stuff that ended up in llvocache.cpp (while starting as a bug fix, now only resulting in a cleanup). *** Added comment 'The use of apr_pool_t is OK here'. Added this comment on every line where apr_pool_t is correctly being used. This should make it easier to spot (future) errors where someone started to use apr_pool_t; you can just grep all sources for 'apr_pool_t' and immediately see where it's being used while LLAPRPool should have been used. Note that merging this patch is very easy: If there are no other uses of apr_pool_t in the code (one grep) and it compiles, then it will work. *** Second Merge (needed to remove 'delete mCreationMutex' from LLImageDecodeThread::~LLImageDecodeThread). *** Added back #include <apr_pools.h>. Apparently that is needed on libapr version 1.2.8., the version used by Linden Lab, for calls to apr_queue_*. This is a bug in libapr (we also include <apr_queue.h>, that is fixed in (at least) 1.3.7. Note that 1.2.8 is VERY old. Even 1.3.x is old. *** License fixes (GPL -> LGPL). And typo in comments. Addresses merov's comments on the review board. *** Added Merov's compile fixes for windows.
2011-01-21Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: ↵Xiaohong Bao
Viewer attempting to load precached images in file types that are not being used.)
2011-01-20fix for SH-829: Viewer attempting to load precached images in file types ↵Xiaohong Bao
that are not being used.
2011-01-12trivial: fix some mac compiling errorsXiaohong Bao
2011-01-06use the private pool in the texture pipelineXiaohong Bao
2010-10-27STORM-104 : make kdu statically linked, suppress the need for llkduMerov Linden