summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.h
AgeCommit message (Collapse)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
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-25NORSPEC-54 Potential fix for crashing on all sorts of random operations.Dave Parks
2013-02-21Merge viewer-cat and resolve conflict with alternate selfGraham Madarasz (Graham Linden)
2012-07-03MAINT-685 Fix for disabling basic shaders making high detail terrain render ↵Dave Parks
incorrectly.
2011-11-29SH-1912 Add environment map back into shiny when lighting and shadows enabled.Dave Parks
2011-10-07SH-2031 Profile guided optimization of matrix opsDave Parks
- don't use F64 except where needed (should really factor out calls to gluProject) - get rid of sorting by texture in favor of sorting by matrix (no sort needed, geometry is already matrix sorted as a result of frustum cull tree traversal order) - unroll matrix sync inner loop and cache MVP and normal matrices
2011-09-22SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and ↵Dave Parks
modify viewer to run under said context without generating errors.
2011-09-20SH-2244 Add "RenderGLCoreProfile" debug setting that allows the viewer to ↵Dave Parks
start with a non-compatibility-profile OpenGL context.
2011-09-17SH-2243 work in progress -- put back ambient lighting when atmospheric ↵Dave Parks
shaders disabled.
2011-09-15SH-2243 work in progress -- use a hash check to avoid redundantly setting ↵Dave Parks
light state
2011-09-15SH-2243 work in progress -- don't use built-in GL light state when shaders ↵Dave Parks
are available.
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-09-13mergeDave Parks
2011-08-31MergeXiaohong Bao
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-07-15Merge from viewer-developmentXiaohong Bao
2011-05-19SH-469 WIP -- get rid of LLMultiSampleBuffer and use ↵Dave Parks
GL_ARB_texture_multisample instead.
2011-02-23apply private pool to VBOXiaohong Bao
2011-02-17SH-1006 Quick pass at cutting down the number of redundant GL calls based on ↵Dave Parks
data from gDEBugger. Reviewed by Nyx.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
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-07-23first pass ui rendering performance improvementsRichard Linden
2010-07-23first pass ui rendering performance improvementsRichard Linden
2010-02-13a better fix for the blend-factor init problem. I think.Tofu Linden
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-02-06Fix for bad GL blend function caching.Dave Parks
2010-02-23Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3Palmer Truelson
2010-02-12Backed out davep's UI optimization. changeset 3134cb7bb181Palmer Truelson
2010-02-04No more matrix ops in UI code.Dave Parks
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong 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-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
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-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
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-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
2008-08-25Fix gcc4 with proper Linden-canonical struct definitionsBrian McGroarty
2008-08-21Additional gcc warnings - no code effectBrian McGroarty
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
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:42:41 +0000