summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
AgeCommit message (Collapse)Author
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-22SL-10969Graham Linden
Fix linear attenuation on forward projector lighting. Revert setup of falloff to prev code. Revert deferred water spec and tweak refl/refr blend.
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-13SL-11107Graham Linden
2019-05-04Fix broken water reflection/refraction mix.Graham Linden
Restore 1.0 alpha to prevent atmo being applied directly to water. Fix broken shadow frust generation.
2019-04-23SL-10946Graham Linden
Limit influence of refraction scale to avoid pulling in lots of background 'deep blue' pixels never written in the distortion map pass.
2019-04-05Fix spec gone wild in ALM water rendering.Graham Linden
2019-04-01Scale the specular contribution to account for brighter highlights.Geenz
This is more or less to achieve the non-ALM bloom behavior in most circumstances. Why scale it? Normalized blinn-phong gets brighter the higher the specular exponent. As it stood, the old spec contribution was extremely bright despite looking "correct". This is largely eyeballed, but generally looks better for all light sources applied to the surface of the water.
2019-04-01Make sure that atmospheric calcs aren't done twice.Geenz
The atomospherics were being applied both in the G-buffer and during the sun light pass. This ensures that is not the case. Additionally, re-enable specular on the water plane, scale the bloom factor to something more reasonable, and also someone broke specular on emissive surfaces. That's fixed too now.
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-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-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-02-01Roll back attempted fix for 9996 on ALM which has unacceptable knock-on effects.Graham Linden
2019-02-01Fix issue with OSX shader compiler not implementing #if correctly (nice job, ↵Graham Linden
Timmy).
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-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-30SL-9996Graham Linden
Force frag depth in water shaders to avoid z-fighting at back edge of water edge pieces.
2019-01-14SL-10355Graham Linden
Modify distortion vec calc in shader to account for modified range of reflection scale above/below.
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.
2018-12-05Shader cleanup and consolidation of use of sRGB conversion funcs.Graham Linden
2018-11-09More incremental revive of 39561 contents to determine cuplrit.Graham Linden
2018-11-09Back out changes causing broken shadows and other render shenanigans.Graham Linden
2018-11-06Move to using a shared deferredUtil object for getting pos/norm from gbuffer.Graham Linden
Eliminate 20+ callsites with copy-paste of getPosition and/or getNorm code. Make pipeline use getShadowTarget/releaseShadowTarget consistently.
2018-11-01SL-9994Graham Linden
Make shaders use consistent naming and parameter order for transport and atmospheric helpers. Share transport and gamma correction code where possible. Add lots of asserts and other validation for when things don't go as planned. Engage dumpShaderSource to get more source output with shader compilation fail.
2018-09-19SL-1505Graham Linden
Prepend dir names to comments in water shaders to differentiate them in nSight captures. Fix calc of reflection camera modelview mats to properly reflect the environment.
2018-09-18SL-1475Graham Linden
Make stars use higher alpha and brighten reflected color before mixing to get stars to show up in reflections on water.
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-03-12De-duplicate shader code for encoding and decoding normals to/from gbuffer ↵Graham Linden graham@lindenlab.com
format.
2018-03-12De-duplicate sRGB conversion funcs from many shadersGraham Linden graham@lindenlab.com
and unify on using the version that works on OSX. Add more logging to shader loading about fallbacks and loading succcess. Add frag shaders for sharing sRGB and normal encode/decode via GL shader linkage.
2017-09-14MAINT-7129 - [Project Alex Ivy][MAC] Materials and ALM shaders broken in Mac ↵ruslantproductengine
viewer FIXED
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-09-20MAINT-3172 fix rendering regressions from release mergedownGraham Linden
2013-09-18The unbearable lightness of being norspecGraham Linden
2013-08-11NORSPEC-341 fix issues with water reflection coloring and abnormalsGraham Linden
2013-07-30NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac ↵Graham Madarasz (Graham Linden)
10.6.8 nV driver issues
2013-07-25NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB ↵Graham Linden
conversion in one place
2013-07-22MATBUG-306 fix alpha knock-on from underwater lightcurve matchingGraham Linden
2013-07-21NORSPEC-315 NORSPEC-316 NORSPEC-312 fix various haze and gamma correction ↵Graham Linden
issues, alpha-blend objects still missing haze underwater
2013-07-17NORSPEC-291 put back conversion to srgb in deferred water shaderGraham Linden
2013-07-17NORSPEC-291 fix materials underwater, disable attempt at materials in ↵Graham Linden
reflect/distort RTs
2013-07-15NORSPEC-291 first attempt at gamma correction of materials in reflectionsGraham Linden
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-04-25NORSPEC-106 Fix for emissive mask overriding environment mask.Dave Parks
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-04MAINT-2371 More optimizations.Dave Parks
Reviewed by Graham
2013-02-07For MAINT-1255 Code Review: DavePGraham Madarasz