summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.h
AgeCommit message (Collapse)Author
2011-10-11SH-2240 WIP on removing lots of string comparisons that were added to deal ↵Dave Parks
with exploding amounts of non-built-in GL state
2011-10-05SH-2031 Fix for stall in image update -- don't use the CPU to convert a ↵Dave Parks
height map into a normal map -- use the GPU instead via a shader. Also, WTF glFinish?
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-29SH-2465 Move FXAA to its own pass independent of DoF (also removes the need ↵Dave Parks
to reload shaders when toggling FSAA on and off)
2011-09-20SH-2243 No deprecated calls for the whole session.Dave Parks
2011-08-21SH-2242 Work in progress on FXAA/glVertexAttrib -- DoF works, physics shape ↵Dave Parks
display still doesn't.
2011-08-11SH-2242 FXAA support instead of unreliable multisample textures (done here ↵Dave Parks
because it's a smaller change than integrating glVertexAttrib with FSAA pipe). Shader integration with LLDynamicTexture subclasses.
2011-08-10mergeDave Parks
2011-08-10SH-2265 Fix for impostor alpha masking being broken.Dave Parks
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-18SH-2031 Fix for link error in llui_libtestDave 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-05-30SH-1682 Full integration if indexed texture rendering to improve batch size.Dave Parks
2011-05-24SH-469 GL_ARB_texture_multisample supportDave Parks
2011-05-23merge latest changes (post-2.7.0) from viewer-developmentOz Linden
2011-05-19SH-469 WIP -- get rid of LLMultiSampleBuffer and use ↵Dave Parks
GL_ARB_texture_multisample instead.
2011-05-04SH-1455 Faster, better, more reliable disabling of DoF effect when edit menu ↵Dave Parks
is open and when effect is opted out of.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-27STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at ↵Nyx (Neal Orman)
merging in windlight estate settings to viewer-dev codebase. not built, not tested. Probably needs a bunch of fixes to be able to be integrated. (resubmitted by Vadim ProductEngine)
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-13Better support for curious mixtures fullbright/shiny/water with rigged ↵Dave Parks
attachments, deferred rendering, and not.
2010-08-13Make rigged attachments respect under water rendering.Dave Parks
Reviewed by Nyx.
2010-08-12Vertex buffer cleanup, adding water shader to simple rigged attachments.Dave Parks
Reviewed by Nyx.
2010-05-04Deferred pipeline integration of rigged attachments and cleanup.Dave Parks
2010-05-01Fullbright shiny skinned.Dave Parks
2010-05-01Fullbrigt skinned and fix for silly crash from not removing face references.Dave Parks
2010-05-01Rigged attachment integration WIP.Dave Parks
2010-04-22Deferred shading for rigged attachments.Dave Parks
2010-04-06Rigged attachments (almost works).Dave Parks
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
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