summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolwater.cpp
AgeCommit message (Collapse)Author
2021-11-12DRTVWR-528 Reverting multiple commits due to moving them into D546 branchAndrey Kleshchev
This reverts commits 9b5b2eac82b1f423daec463b3d55d0f3d3979bbc SL-15933 53c0144dd272470172591b967a84beaa4019b728 SL-11687 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 SL-16056 b854eceee3a867d64b20de18d6b7ce91b33abed0 SL-15391 921c3f5f69c90b5924d2f4bbbd32455f8c9c8173 SL-13561 639acb6ff7495a6840d437dd8473172ec03e200a SL-15333
2021-09-15SL-15993 Disabling transparent water should not disable advanced lightingAndrey Kleshchev
2020-09-28Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-05-13SL-12007 Toggling 'Transparent water' checkbox has no effectAndrey Kleshchev
Opaque water is not compatible with ALM
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2019-10-25SL-12014 Animesh is now a separate rendering typeandreykproductengine
2019-08-13SL-11212Graham Linden
Calculate sunAngle2 correctly given light dir in new coord space.
2019-08-12SL-10566, SL-10677Graham Linden
Make sky updates only occur if the input atmospherics values have actually changed (perf optimization). Make water rendering use specular color for coloring spec.
2019-06-06SL-11367Graham Linden
Use rotated lightnorm directly in water shader instead of forcing all shaders marked as water (including lighting) to get that norm (where it would only affect Mid as only that graphics mode has atmospherics on but isn't using deferred rendering).
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-03-19SL-10763Graham Linden
Fix broken logic for alpha drawpool when rendering with basic shaders off. Force unbind of 2nd tex unit that we use during water rendering.
2019-03-05Don't rebuild reflection when only edge water patches are in play.Graham Linden
Use (Restore)TexSetup for tex binding (should be equivalent now). Simplify uniform management in alpha drawpool loop. Fix wrong modelview mat being used for distortion map gen.
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-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-21MergeGraham Linden
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-02-06Backed out changeset: 43f8558c602bandreykproductengine
2019-02-05temp fogandreykproductengine
2019-02-01SL-9996, SL-1130, SL-5546Graham Linden
Fix bug with setting texture matrix for rigged mesh. Fix z-fighting between sea and sky in ALM by cheating sky, stars, and moon using gl_FragDepth. Fix handling of atmospheric haze glow w.r.t independent sun/moon positioning (we can no longer depend on them being mutex to each other).
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-30Eliminate helper GLSL modules depending on further GLSL modules to give ↵Graham Linden
Intel HD x000 compiler a fighting chance. More WIP for edge-specific water shader for 9996.
2019-01-30WIP for 10374 (reduce number of shaders linking against deferredUtil).Graham Linden
Prepare for using ifdef to conditionally engage using gl_FragDepth in water shaders (because GL requires that writing to gl_FragDepth on any path means you need to write a depth value on every path).
2019-01-08MergeGraham Linden
2019-01-07SL-10304 fix handling of water normal map blending when both current and ↵Graham Linden
next textures are identical.
2019-01-03Fix two files stomped my merging VR before a downstream branch.Graham Linden
2018-11-15Merge 6ishGraham Linden
2018-10-19SL-9929Graham Linden
Replace WL atmospherics sun color calcs, fix water specular sunlight contribution to use them, and do not add moon contribution during daytime.
2018-10-01SL-1655Graham Linden
Make water horizon consistent between ALM and non-ALM rendering again. Fix using deferred sky rendering in reflections. Make matrix mode explicit around push/pop for safety.
2018-09-24line endings fixAndreyL ProductEngine
2018-09-19SL-9696Graham Linden
Remove squashfarclip hackery to make horizon lines in deferred match non-ALM rendering to avoid seam when rendering deferred.
2018-09-18SL-9685Graham Linden
Make sure legacy opaque water texture ID is assigned so it can be bound for lowest graphics use.
2018-08-30MAINT-9007Graham Linden
fix management of water plane and fog Ks shader uniforms
2018-08-23MAINT-9006Graham Linden
Make perspective projection consistent between ALM and non-ALM when drawing water (horizon matches). Make perspective projection consistent between ALM and non-ALM when drawing heavenly bodies (sun disc position matches). Make gamma correction of sun disc tex consistent between ALM and non-ALM rendering.
2018-08-14Remove MSVC optimize pragma.Graham Linden
2018-08-14MAINT-8884 Re-arrange water norm/reflection tex binding to be less incorrect.Graham Linden
2018-07-27fix init on arrayRider Linden
2018-07-27Pausing the clouds will now also stop the waves.Rider Linden
2018-06-26Fix OSX bug from OLD_SELECT GLSL work-around define not being used with ↵Graham Linden
automatically linked feature shaders. Add LL_RELEASE_FOR_DOWNLOAD ifdef around launcher nag. Fix OSX 10.14 SDK compile issue from unused var in scroll list.
2018-06-13Mods to hook up water settings to water normals for rendering with support ↵Graham Linden
for current to next blending. Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings. Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-11Fix water fog consolidation in underwater shaders.Graham Linden
Add plumbing facilities to allow current and next moon textures to be passed to moon shader. Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-01Modify use of sky settings, reduce complexity, and name funcs to indicate ↵Graham Linden
coord systems in use. Fix class2 softenLightF shader.
2018-05-21Make rendering of sun / moon work with both in the sky (test visibility ↵Graham Linden graham@lindenlab.com
independently).
2018-05-18Make nighttime elev constant _SIN, since it uses a sin value.Graham Linden graham@lindenlab.com
Put that constant in sky settings and eliminate dups. Fix up logic around when to use heavenly bodies (fix broken moon in basic sky). Remove unnecessary clip to horizon. Put in temp code to ena/dis sun/moon based on LLEnvironment::getIsDaytime().
2018-05-01Le MergeGraham Linden graham@lindenlab.com
2018-03-08Add LLVoSky wrapper for current env sky light direction.Graham Linden graham@lindenlab.com
Make LLVo classes use LLVoSky wrappers instead of direct access. Isolate more legacy haze param usage w/in settings.
2018-03-08Rename getFogColor from water and sky settings to getWaterFogColor and ↵Graham Linden graham@lindenlab.com
getSkyFogColor.
2017-10-13Watter settings active and start of new joystick button type.Rider Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-10-08merge from viewer-releaseRichard Linden