diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-30 17:33:16 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-30 17:33:16 +0000 |
| commit | baebf981ac90769905980da2fc9a73f8f88b1ba0 (patch) | |
| tree | b5524435c9a4c2f9af37a371b1ea9263cac45748 /indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl | |
| parent | c8a79a59c94192741c8239eac6b34e50fe835bcd (diff) | |
| parent | 12cd42221e16b8bbcd0ad115e0436b075d47d485 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #247)
SL-10415, SL-10434, SL-10416
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl index e98ab1f2eb..15f141cbe5 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl @@ -40,7 +40,7 @@ uniform sampler2DRect normalMap; // Inputs VARYING vec2 vary_fragcoord; -vec3 decode_normal (vec2 enc); +vec3 getNorm(vec2 pos_screen); vec4 getPosition(vec2 pos_screen); //calculate decreases in ambient lighting when crowded out (SSAO) @@ -53,7 +53,7 @@ void main() //try doing an unproject here vec4 pos = getPosition(pos_screen); - vec3 norm = decode_normal(texture2DRect(normalMap, pos_screen).xy); + vec3 norm = getNorm(pos_screen); frag_color[0] = 1.0; frag_color[1] = calcAmbientOcclusion(pos, norm, pos_screen); |