diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-20 16:44:39 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-20 16:44:39 -0700 |
| commit | 2a03e8f9fb24bb68b79e34bcfa9a45d3e377b0b8 (patch) | |
| tree | b6d325cb77de72da605fc4fc032cf4970126ee14 /indra/newview/app_settings/shaders/class1/environment | |
| parent | 8aadd9d27025e6ed8e50e88ec9548d48e48095c8 (diff) | |
MAINT-3172 fix rendering regressions from release mergedown
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl | 2 | ||||
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/environment/waterF.glsl | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl index 485e48537c..0d8dab0a41 100755 --- a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl @@ -43,11 +43,13 @@ uniform vec2 fbScale; uniform float refScale; uniform float znear; uniform float zfar; +uniform float kd; uniform vec4 waterPlane; uniform vec3 eyeVec; uniform vec4 waterFogColor; uniform float waterFogDensity; uniform float waterFogKS; +uniform vec2 screenRes; //bigWave is (refCoord.w, view.w); VARYING vec4 refCoord; diff --git a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl index 1fd7bdaa5c..79bffab745 100755 --- a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl @@ -42,6 +42,8 @@ uniform vec3 lightDir; uniform vec3 specular; uniform float lightExp; uniform float refScale; +uniform float kd; +uniform vec2 screenRes; uniform vec3 normScale; uniform float fresnelScale; uniform float fresnelOffset; |
