summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
AgeCommit message (Collapse)Author
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
2020-10-28SL-14224 RelWithDebInfo viewer stops with 'assert' when disabling ↵Andrey Kleshchev
atmospheric shader
2020-09-29SL-13500 loadShaderFile crashAndrey Kleshchev
2020-03-24Fix for bad fullbright shiny shininess values and inconsistency between ↵Runitai Linden
materialF and fullbrightShinyF
2020-01-31SL-12594, fix one missed occurance of VertexShaderEnable settingDave Houlton
2020-01-29SL-12594, remove conditional checks for VertexShaderEnable settingsDave Houlton
2020-01-23DRTVWR-440, another whitespace only (detabify) to test TeamCity triggersDave Houlton
2019-08-23SL-11774Graham Linden
Fix diffuse boost when water fog is enabled and make deferred underwater shader participate in EEP/WL param updates by marking it as a water shader.
2019-08-22SL-11776Graham Linden
Fix false alarming sky updates and doing expensive CPU work for same sky pixels.
2019-07-12SL-11588Graham Linden
Make avatar alpha shader ignore vertex color again.
2019-07-12SL-11109Graham Linden
Make shadowAlphaMask shader ignore vertex alpha before discards iff we're a fullbright object. Keep llappearance from stuffing dangling pointers into the alpha cache (crash iff you're using nSight debugging and disable readbacks).
2019-07-02SL-11533Graham Linden
Make alpha shader include vertex color modulation in both srgb and linear flavors.
2019-06-27SL-11503 take twoGraham Linden
Make ALM use of non-ALM water rendering for refraction map light differently than non-ALM use of same.
2019-06-11SL-11370, SL-11372, SL-11337Graham Linden
Fix culling on Low+ water reflection pass. Make Mid+ / High use class1 deferred sky again (no rainbows, but faster!). Fix setting of cloud color for deferred sky/cloud shaders. Put water reflections back in wrong colorspace for consistency with release.
2019-05-23Add render debug controls for forcing disable of ambient, sun, and local ↵Graham Linden
light contributions (engages AMBIENT_KILL, SUNLIGHT_KILL, and LOCAL_LIGHT_KILL defines in shaders to accomplish those tasks as required by each render mode).
2019-05-22SL-11260Graham Linden
Make terrain underwater shader not try to light said terrain. Fix colorspace of reflected color in non-ALM shading. Tweak transparency of water further.
2019-05-21SL-11238Graham Linden
Fix ambient light inputs to the renderer. Fix 3rd sky shader w/ mistaken density mod conversion. Make ambient clamp apply to all modes. Tune ALM ambient clamp to match non-ALM.
2019-05-17SL-11112Graham Linden
Fix blend between reflected/refracted water maps (make less transparent) and fix setting of water fog color alpha on low end to better match prev behavior of setting the internal control value in that case.
2019-05-08Merge viewer-releaseGraham Linden
2019-05-02Roll back sRGB decode changes from contrib for now.Graham Linden
Fix direct light matching across alpha/blended-material/deferred. Get diffuse lighting to match from Low to Ultra.
2019-04-25Fix dark ALM and strangeness at Mid lighting (class 3 but with a darkness ↵Graham Linden
about it). Make a distinct class3/lighting/lightV which boosts to WL levels (* 2.0) and make lighting without WL atmo enabled use class 2 or below. Make forward shaders (alpha and materialF with alpha-blend mode on) more consistent with deferred lighting.
2019-04-10SL-10901Graham Linden
Fix up shadow sampling and tweak shadow biasing. Clean up shader decls of unused funcs. Clean up whitespace diffs from release.
2019-04-10Merged in Geenz/viewer-eep/OPEN-340 (pull request #345)Rider Linden
OPEN-340 & OPEN-343 - Consolidate shader atmospheric calcs into a singular utility shader + fix fog on fullbright in deferred
2019-04-10SL-10925, SL-10926, SL-10896Graham Linden
New fix for 925/926 that doesn't cause 896 again. Also linearize moon disc tex color.
2019-04-10Separate out vertex program objects from fragment program objects and use it.Geenz
Given that mShaderObjects only ever expects one copy of a given shader object (leading to lots of "shaderV" and "shaderF"), it made having utility shaders a bit more difficult to incorporate. This change makes sure the two are separated. Using this over a multimap largely for readibility. Also, actually, you know, use this functionality. --HG-- branch : OPEN-340
2019-04-09First stab at moving atmospheric var calcs to its own utility shader.Geenz
Still some work to go here. Largely related to how certain values (i.e., SSAO mix values) are supplied. But so far, so good. --HG-- branch : OPEN-340
2019-04-05SL-10821Graham Linden
Fix directionality of da and preserve bumps on completely shadowed areas.
2019-04-03Add shader unloads for new deferred avatar/attachment alpha/mask shadow shaders.Graham Linden
2019-04-03Replace MAINT-8836 fix dropped in merge of 6.1.2Graham Linden
2019-04-03Replace dropped code from 6.1.2 for loading new avatar/attachment alpha/mask ↵Graham Linden
shadow shaders.
2019-04-02SL-10853Graham Linden
Fix windlight shader level selection.
2019-04-02Fix shader link fail from forward decl of wrong soft clip func in class 1.Graham Linden
Fix trying to bind diffuse maps for shader without uniform in shadow shaders. Clean up merge fail around mShaderLevel namechange.
2019-04-02Merge 6.1.2 LoveMeRender new hotnessGraham Linden
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-02Remove pragma for turning off optimization for debugging.Graham Linden
2019-04-02Roll back KDU to 7.a.4 version instead of updating to 7.a.7Graham Linden
2019-03-13Further tab restoration and whitespace delta minimization.Graham Linden
2019-03-13Mods to make merge with viewer-release have less whitespace-only change and ↵Graham Linden
fix diffs between EEP and VR.
2019-03-07SL-10618, SL-10698Graham Linden
Fix reflection/distortion map culling planes again. Fix broken handling of shadow disables in ALM forward shaders.
2019-03-03SL-10664, SL-10666Graham Linden
Fix up culling issues from perf work and fix Depth of Field rendering to get depth values properly. Baseline for performance work.
2019-03-02SL-10664Graham Linden
2019-02-28EEP performance WIPGraham Linden
Mods to improve alpha obj render performance. Removes hacky fix for HUD elements getting atmospherics. Re-orders rendering of glow to remove ~10ms/frame of shader re-re-rebinding. Fix up default classes and basic shader loading (remove unused shared modules).
2019-02-27SL-10566 part the fourthGraham Linden
Fix water rendering causing distortion map update very frame. Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness). Add ability to retrieve current user clip plane so it can be saved/restored around water map gen. Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again. Re-enable occlusion in distortion map rendering.
2019-02-26SL-5186, SL-10612Graham Linden
Fix lighting and gamma correction differences between deferred and forward rendering including materials objects. Verify 10612 and 10500 remain fixed. Make sure all necessary deferred shaders get the atmospheric uniform updates for doing frag-based atmospherics.
2019-02-22SL-9994Graham Linden
Fix linkage of underwater terrain shader to include atmo helper GLSL for getEyePosition().
2019-02-21SL-10501Graham Linden
Fix broken matrix management code causing modelview mats to be used as tex anim mats (do not depend on default matrix mode already being set). Give the deferred terrain shader a name. Make LLRender use the eMatrixMode enum instead of ints.
2019-02-13SL-10181, SL-10546Graham Linden
Fix distortion map rendering in deferred mode not including underwater fog effects. Fix distortion map rendering not including post-deferred content at all. Fix distortion map rendering not including anything but sky when camera is underwater. Update sun_up_factor/sunmoon_glow_factor uniforms even when sun disc isn't in use.
2019-01-319996 partial fix (works for non-ALM rendering only)Graham Linden
Use a new edge water shader to allow forcing frag depth to avoid z-fighting at back edge of water edge pieces. This will not work for ALM because forcing the depth breaks the use of the depth to backproject gbuffer position which breaks lighting calcs.
2019-01-30Make shadow map gen shaders not link against shadowUtil module so Intel HD ↵Graham Linden
x000 compiler can get under it's Yugo-like allotment of texture units.
2019-01-30Reduce shadow shader linkage of deferredUtil module to try to get Intel HD ↵Graham Linden
x000 compiler to link again.