summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2012-10-09Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/lindenlab/viewer-development-materials.
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-08-29Use an unordered map for custom #defines instead of a map. Lookups are ↵Jonathan Goodman
faster, and we don't really care about any particular order anyways for these.
2012-08-29Added the ability to remove a preprocessor define.Jonathan Goodman
2012-08-29Just pass in an empty preprocessor definition map from now on. The shader ↵Jonathan Goodman
compiler won't add new #defines if it's empty.
2012-08-28Added new bindTexture and unbindTexture API to LLGLSLShader. Reviewed by davep.Jonathan Goodman
2012-08-28Added support for adding custom preprocessor definitions (for shader ↵Jonathan Goodman
permutations)
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-24Minor improvement to identifying gl lib to use. Should use xcode version.Aura Linden
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-19fix for SH-3238: Textures are loaded at lower detail on subsequent log-insXiaohong Bao
2012-07-18llglheader include change for building on LionAura Linden
2012-07-14merge back beta fixes for DRTVWR-180Oz Linden
2012-07-11Fix merge issues - duplicate insertions of codesimon@Simon-PC.lindenlab.com
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-03MAINT-685 Fix for disabling basic shaders making high detail terrain render ↵Dave Parks
incorrectly.
2012-06-28MergeDave Parks
2012-06-28mergeDave Parks
2012-06-27Removing unreferenced methods from the LLRenderNavPrim class.Todd Stinson
2012-06-26Updating the header licensing comments.Todd Stinson
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-22MAINT-653 Fix for shadow acne at high altitudesDave Parks
2012-06-22mergeDave Parks
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-15Merge with tipcallum
2012-06-13MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-06-04mergeBrad Payne (Vir Linden)
2012-06-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-05-30MAINT-616 Fix for mac build.Dave Parks
2012-05-30Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix ↵Dave Parks
VBO accounting.
2012-05-25MAINT-616 Potential fix for corrupted mip maps.Dave Parks
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-25MAINT-616 Faster issuance of occlusion queries.Dave Parks
2012-05-24MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.Dave Parks
2012-05-22MAINT-616 Fix for crash on teleport from previous changesDave Parks
2012-05-22merge changes for DRTVWR-149Oz Linden
2012-05-22MAINT-616 Fix for crash on shutdown caused by previous changes.Dave Parks
2012-05-21MAINT-616 Factor out calls to glGenFoo where possible, add setting to ↵Dave Parks
control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
2012-05-20Merged with viewer-betaKitty Barnett
2012-05-15MAINT-616 Different VBO Pooling scheme -- populate VBO pool with buffers ↵Dave Parks
that are likely to be requested, but never reuse a previously used buffer.