diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-24 11:15:42 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-24 11:15:42 -0700 |
| commit | 15f5d8caf8fc51999c4de4217ed5ac37fa911ae9 (patch) | |
| tree | 018b6c9189a3227cfca2a00ffdf1178b8220362c /indra/newview | |
| parent | 1529c16201d332ce7bbff5c3637737ca58277eb9 (diff) | |
SL-10698
Reduce effect of refScale again to eliminate sampling beyond the correct area in the distortion map and getting the water fog color on the shoreline.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/waterF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/waterF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl index 51b131ada7..b86867c460 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl @@ -152,7 +152,7 @@ void main() spec = pow(spec, 128.0); //figure out distortion vector (ripply) - vec2 distort2 = distort+wavef.xy*refScale/max(dmod*df1, 1.0); + vec2 distort2 = distort+wavef.xy*refScale*0.16/max(dmod*df1, 1.0); vec4 fb = texture2D(screenTex, distort2); diff --git a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl index 750de7100f..b3ae64bd82 100644 --- a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl @@ -145,7 +145,7 @@ void main() spec = pow(spec, 128.0); //figure out distortion vector (ripply) - vec2 distort2 = distort+wavef.xy*refScale/max(dmod*df1, 1.0); + vec2 distort2 = distort+wavef.xy*refScale*0.16/max(dmod*df1, 1.0); vec4 fb = texture2D(screenTex, distort2); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index fc7408a8e5..ef88d43cc4 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1395,7 +1395,7 @@ bool LLPipeline::canUseVertexShaders() bool LLPipeline::canUseWindLightShaders() const { return (!LLPipeline::sDisableShaders && - gWLSkyProgram.mProgramObject != 0 && + /*gWLSkyProgram.mProgramObject != 0 &&*/ LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1); } |