summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2013-06-27Merge with viewer-releasecallum_linden
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-24NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sourcesGraham Linden
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-19MergeGraham Linden
2013-06-19Merge with viewer-release.Geenz
2013-06-18Review cleanupDave Parks
2013-06-18Occlusion culling overhaul.Dave Parks
2013-06-17MAINT-318 prevent crashes from incomplete quads and lines and prevent ↵Graham Linden
drivers from crashing to desktop when passed short buffers
2013-06-13SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
changed Units macros and argument order to make it more clear optimized units for integer types fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-05BUILDFIX: fixed llviewerassetstats test and render2dutils changesRichard Linden
that were dropped in merge
2013-06-05merge with viewer-releaseRichard Linden
2013-06-03NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent ↵Dave Parks
calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-05-29NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix ↵Dave Parks
testing based overhaul WIP Reviewed by Graham
2013-05-23NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny ↵Dave Parks
descrepencies.
2013-05-22Revert changes for MAINT-2616 due to licensing issues, need a full patchsimon
submitted to be acceptable
2013-05-20MAINT-2616 : Updated my Intel driver and now have orange in buttons andsimon
Inventory pull down bar causing blinks to screen. Pulled in FS code, Reviewed by Kelly
2013-05-14Fix EOL characterssimon
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-05-13De-bork the viewer merge, causing black in-world images. Reviewed by Kellysimon
2013-05-11Merge vwr-dev-matGraham Madarasz
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs ↵Graham Madarasz
(unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
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-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header ↵Richard Linden
dependencies
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-22for SH-4133: create a debug tool to show textures in active fetchingXiaohong Bao
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