summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolsimple.cpp
AgeCommit message (Collapse)Author
2014-03-12merge with releaseRichard Linden
2013-11-11MAINT-3429 remove GeForce hack which is causing issues with auto-alpha masks ↵Graham Madarasz (Graham Linden)
in deferred
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-01Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-08-12NORSPEC-342 fix blocky hair in ALM from writing depth for transparent pixels ↵Graham Linden
in impostor rendering
2013-07-23NORSPEC-314 make work-around apply to all Macs for nowGraham Linden
2013-07-23NORSPEC-314 WIP make work-around easier to flip and add 9800M as an evil macGraham Linden
2013-07-21NORSPEC-311 fix alpha / opaque lighting diffsGraham Linden
2013-07-18NORSPEC-314 work-around mystery mac GeForce crash from new shader for nspec 295Graham Madarasz
2013-07-03NORSPEC-295 make a deferred path version of fullbright alpha mask shader so ↵Graham Linden
we can included gamma ops
2013-06-05NORSPEC-232 Fix for broken alpha masking with basic shaders disabled.Dave Parks
2013-06-03MATBUG-151 Fix for black textures on Intel HD when glow is present.Dave 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-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-10NORSPEC-75 Fix bug introduced by previous change where objects with an ↵Dave Parks
emissive mask appear fullbright.
2013-04-10NORSPEC-75 Add appropriate draw calls to underwater render passes so objects ↵Dave Parks
with material data don't disappear in water.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2011-11-02SH-2541 Fix for speckles on avatar on some cards -- don't use ↵Dave Parks
"maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-08-10SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline ↵Dave Parks
complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
2011-08-08SH-2242 Work in progress migrating to glVertexAttrib everywhereDave Parks
2011-07-29SH-2181 Fix for alpha flickering when basic shaders enabled (don't use ↵Dave Parks
glAlphaFunc when shaders are available). Reviewed by Leslie
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-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)
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-06-03trivial comment fixTofu Linden
2010-05-12Fix for fullbright bump not working in deferred render.Dave Parks
Fix for shadow artifacts around split frusta. Tweak for shadow aliasing with projectors. Fix for crash on exit in mesh thread. (transplanted from 6dcf09cd3e524016c8130a0c8af3d9fc95f2d411)
2010-04-27Stop z-fighting in glow pass.Dave Parks
(transplanted from a1ec712ffcf5a8b21d2d441b348022fa8e4a44c2)
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-08-26svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
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-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ." Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing: newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files) newview/llpostprocess.* -> llrender/llpostprocess.* newview/llrendersphere.* -> llrender/llrendersphere.* newview/llcubemap.* -> llrender/llcubemap.* llwindow/llgl.* -> llrender/llgl.* llwindow/llglstates.h -> llrender/llglstates.h llwindow/llgltypes.h -> llrender/llgltypes.h llwindow/llglheaders.h -> llrender/llglheaders.h
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-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-21svn merge -r 59178:59364 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-07SKIPPED 58849. merge -r 58856:58859 maintenance -> releaseSteven Bennetts
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-02Print done when done.James Cook