summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpool.cpp
AgeCommit message (Collapse)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-05-29NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix ↵Dave Parks
testing based overhaul WIP Reviewed by Graham
2013-05-09Merge downstream code and viewer-betasimon
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-04MAINT-2371 More optimizations.Dave Parks
Reviewed by Graham
2013-02-04Added a new draw pool specifically for faces with materials applied to them. ↵Geenz
Removed materials rendering from the bump draw pool, and reverted it to its previous state.
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-24merge to viewer-developmentoOz Linden
2012-07-03MAINT-685 Fix for disabling basic shaders making high detail terrain render ↵Dave Parks
incorrectly.
2012-06-15Merge with tipcallum
2012-06-13MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-06-01MAINT-646 Faster traversal of render batch lists.Dave Parks
2012-05-09Added support to disable a draw pool. When the movable option checkbox is ↵prep
selected we will now also cull the terrain draw pool.
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-08-08SH-2242 Work in progress migrating to glVertexAttrib everywhereDave Parks
2011-07-17SH-2031 High risk changeset, but potentially high reward. Addresses frame ↵Dave Parks
stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-06-22merge latest viewer-developmentOz Linden
2011-06-01SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger ↵Dave Parks
vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-05-31SH-1682 Dynamically adjust the number of texture channels to use for indexed ↵Dave Parks
texture rendering based on available hardware.
2011-05-30SH-1682 Full integration if indexed texture rendering to improve batch size.Dave Parks
2011-05-29SH-1682 Work in progress on using texture indexes to improve batch size ↵Dave Parks
(wow, super fast so far)
2011-05-26storm-1189: remove more of the code for classic cloudsOz Linden
2010-10-27Automated merge up from viewer-developmentLoren Shih
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-30Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low ↵Merov Linden
altitude flicker though (STORM-306)
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-05-01Rigged attachment integration WIP.Dave Parks
2010-04-14Remove calls to llpushcallstacks from inner loops.Dave Parks
2010-03-04Optimiziation pass.Dave Parks
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers. Faster traversal of LLCullResult members. Removal of llpushcallstacks from inner loops. Sprinkling in fast timers.
2010-03-04Optimiziation pass.Dave Parks
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers. Faster traversal of LLCullResult members. Removal of llpushcallstacks from inner loops. Sprinkling in fast timers.
2010-02-06Draw prims using triangle strips instead of triangle lists.Dave Parks
2010-02-06Draw prims using triangle strips instead of triangle lists.Dave Parks
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-10-27Extra debugging info for EXT-1456Palmer
Reviewed by Bao
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
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-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-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington