summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge downstream code / viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-26Fix ifdefs around asserts broken in release only by mergeGraham Madarasz
2013-04-26Provide LLGLSLShader backwards compat so as not to break the appearance utilityGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-24Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-04-24diff -r 59c7bed66dfd indra/llcommon/lleventapi.hsimon
2013-04-24NORSPEC-59 NORSPEC-125 make materials and alpha shaders work on Mac laptops ↵Graham Madarasz
with nV mobile graphics cards
2013-04-23Tweak to remove usage of GL_DEPTH_CLAMP for now until projectors can be made ↵Dave Parks
to work with it.
2013-04-20Fix rendering artifacts on Mac Mobile GeForce cardsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17NORSPEC-59 and NORSPEC-133 work-around crash with RenderDebugGL on and fix ↵Graham Madarasz
breakage in shaders from Mac changes
2013-04-16merge changes for alpha fixes from geenzOz Linden
2013-04-15Merged Graham's stuff amongst others.Geenz
2013-04-15Fix for mac buildDave Parks
2013-04-15NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where availableDave Parks
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-11First pass on alpha blended materialsGeenz
2013-04-09NORSPEC-59 work around nV driver crash when doing deferred rendering on NV ↵Graham Madarasz
9400M/9600M
2013-04-02NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.Dave Parks
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-03-29NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps.Dave Parks
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28Merged lindenlab/viewer-development into defaultgraham linden
2013-03-25NORSPEC-54 Potential fix for crashing on all sorts of random operations.Dave Parks
2013-03-25Pull and merge downstream code with CHUI viewer-development by way of ↵simon
viewer-lion
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-22Pull and merge latest viewer-betasimon
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-16CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on ↵merov
Linux
2013-03-13MergeDave Parks
2013-03-13MAINT-2410 Extra Particle Parameters -- viewer implementationDave Parks
Reviewed by Kelly and Graham
2013-03-13More fixes for gcc-4.6 breakageDon Kjer
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
re-introduced don's refactor of low-level openGL calls pulling out of llui and putting them into llrender. Took the new code from their updated versions from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12Merge pragma warning hack to fix linux buildGraham Madarasz (Graham Linden)
2013-03-12CHUI-846 FIXED [crashhunters] crash in LLFontGL::maxDrawableCharsmaksymsproductengine
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-03-04Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks