summaryrefslogtreecommitdiff
path: root/indra/newview/lltextureview.cpp
AgeCommit message (Collapse)Author
2012-07-02Merge 3.3.3 release with Drano HTTP library at 3.3.0Monty Brandenberg
Big delta was converting the new texture debugger support code to the new library. Viewer manifest should probably get an eyeball before release.
2012-06-22mergeDave Parks
2012-06-19Cleanup: move magic nubmers to new _httpinternal.h header file.Monty Brandenberg
2012-06-18Tidy Texture Console, add cache & resource wait stats, issue stats line to ↵Monty Brandenberg
log on exit. With much trial-and-error, cleaned up the banner on the texture console and made everything mostly fit. Added global cache read, cache write and resource wait count events to the console display to show if cache is working. On clean exit, emit a log line to report stats to log file (intended for automated tests, maybe): LLTextureFetch::endThread: CacheReads: 2618, CacheWrites: 117, ResWaits: 0, TotalHTTPReq: 117
2012-06-14LLMutex recursive lock, global & per-request tracing, simple GET request, ↵Monty Brandenberg
LLProxy support, HttpOptions starting to work, HTTP resource waiting fixed. Non-LLThread-based threads need to do some registration or LLMutex locks taken out in these threads will not work as expected (SH-3154). We'll get a better solution later, this fixes some things for now. Tracing of operations now supported. Global and per-request (via HttpOptions) tracing levels of [0..3]. The 2 and 3 levels use libcurl's VERBOSE mode combined with CURLOPT_DEBUGFUNCTION to stream high levels of detail into the log. *Very* laggy but useful. Simple GET request supported (no Range: header). Really just a degenrate case of a ranged get but supplied an API anyway. Global option to use the LLProxy interface to setup CURL handles for either socks5 or http proxy usage. This isn't really the most encapsulated way to do this but a better solution will have to come later. The wantHeaders and tracing options are now supported in HttpOptions giving per-request controls. Big refactoring of the HTTP resource waiter in lltexturefetch. What I was doing before wasn't correct. Instead, I'm implementing the resource wait after the Semaphore model (though not using system semaphores). So instead of having a sequence like: SEND_HTTP_REQ -> WAIT_HTTP_RESOURCE -> SEND_HTTP_REQ, we now do WAIT_HTTP_RESOURCE -> WAIT_HTTP_RESOURCE2 (actual wait) -> SEND_HTTP_REQ. Works well but the prioritized filling of the corehttp library needs some performance work later.
2012-06-07Lock/Mutex fixes, documentation, new resource wait state, dtor cleanupsMonty Brandenberg
Went through all the code and tried to document lock and thread usage in the module. There's a huge comment block introducing all of this at the beginning and I believe it's correct (though not quite complete). Keep it updated, people. Added a new state, WAIT_HTTP_RESOURCE, that's sort of a side-state of SEND_HTTP_REQ. If we hit a high-water mark for HTTP requests, the extra are shunted to the new state once. Once levels fall to a low-water mark, we run through a wait list of UUIDs, sort the valid ones by priority and release them for service. This keeps the HTTP layer busy while leaving the active queue shallow enough that requests can still be re-prioritzed cheaply. Priority model changed. The new state uses the PRIORITY_LOW mask, the old users of _LOW are now at PRIORITY_NORMAL and sleepers woken up after an external event are kicked off at PRIORITY_HIGH. This combination along with the new state should avoid priority inversion and keep things running without resorting to an infinite pipeline. New state displays as "HTW" with green text in the texture console. Request cancelation and worker run-down should now be more correct but this edge case may need more attention.
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-24fix for VWR-28996: Texture stalls and threading modelsXiaohong Bao
2012-05-02merge viewer-release to dranoBrad Payne (Vir Linden)
2012-03-06texture view console tweaksBrad Payne (Vir Linden)
2012-03-06via richard - fix to keep texture debug console anchored at the topBrad Payne (Vir Linden)
2012-02-29SH-3018 WIP - removed obsolete texture category and texture size consolesBrad Payne (Vir Linden)
2012-01-31EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2011-10-04SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add ↵Dave Parks
accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
2011-09-26mergeDave Parks
2011-09-06EXP-1196 FIX Fix param block template orderingRichard Linden
changed ordering of template loading relative to constructor setting of params moved a lot of constructor-set params to template files reviewed by Leslie
2011-08-08SH-2242 Work in progress migrating to glVertexAttrib everywhereDave Parks
2010-12-13debug code for SH-639: http requests 3X more in viewer 2.4Xiaohong Bao
2010-09-13for VWR-22936: design test code/plan for the object cache.Xiaohong Bao
2010-09-02debug code for VWR-22435: investigating texture related network traffic ↵Xiaohong Bao
between viewer 2.x and 1.23.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-15EXT-8135 FIXED Textures blurry when in Appearance Edit modeLoren Shih
EXT-8445 Reduce baked texture timeout fro 120sec to 60sec default Also did some minor infrastructure cleanup, added code comments, etc. There is now separate logic for determining how to handle update (versus upload) requests. Also made a trivial change to llvoavatar to properly encapsulate mAppearanceAnimating. Also reduced the baked texture timeout to 60s (in settings.xml)
2010-06-04EXT-7526 WIP Add baked texture information to texture viewLoren Shih
More informative logic added in to track when an upload is actually happening. Did some minor reformatting.
2010-06-04EXT-7526 WIP Add baked texture information to texture viewLoren Shih
Added color, emphasis, and more information to texture view.
2010-06-02EXT-7526 WIP Add baked texture information to texture viewLoren Shih
EXT-7504 WIP Force decloud after timeout using lower res textures Better formatting for baked texture information. Also added exponential timeout for sending low res baked textures.
2010-06-02EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Added more information into the texture debug view.
2010-05-28EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Code cleanup. Some minor changes in logic for when low res texture is used. Added more metrics to notifications and texture debug output.
2010-05-27EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
EXT-7526 FIXED Add baked texture information to texture view First attempt at low res textures after timeout. Added debug setting to control whether low res texture timeout is used. Added baked texture load information to texture view debug display. Trivial name changes to some variables.
2010-03-09fix for texture view widget deletion spamRichard Linden
2010-03-08better fix for spam in LLTextureViewRichard Nelson
reviewed by Palmer
2010-03-07trival fix to eliminate unnecessary warnings "LLView::~LLView(): Deleting ↵Xiaohong Bao
view " << mName << " during UI draw() phase" caused in lltextureview.cpp (from the texture console).
2010-03-07partial fix for EXT-5711: Some textures loading from cache seems jammed.Xiaohong Bao
This fix should be able to improve the speed of loading texturs from cache noticeably (30% or more). More fix to come.
2009-12-18Additional HTTP Texture tuniningSteve Bennetts
* Important fix in lltexturefetch.cpp where a 'partial' resonse was incorrectly setting mHaveAllData.
2009-12-17HTTP Texture changes:Steve Bennetts
* Fixed bug in llqueuedthread.cpp causing unnecesssary sleeeping * Fixed an issue that was preventing retries on 503 errors * Added number of pending creates to Texture View * Increased time allocated for texture creates
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-07Fix Linux build - failing due to warning about S32/float conversionJames Cook
2009-07-06fix for DEV-34094: texture console stats are obscured by the loading texturesXiaohong Bao
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-03-13svn merge -r114093:114412 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-02-03svn merge -r107016:108767 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵Mark Palange
101837 to 103519
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated