diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-07 12:34:05 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-07 12:34:05 -0600 |
| commit | a6e40e6e02600cb47299dc9903400720786f72f0 (patch) | |
| tree | 2118cfa7cf57465e41aab13c97778ed1939995ed /indra/newview/app_settings/shaders/class1/deferred | |
| parent | 0a43fdd07e3b084ce230086c032ccef79f1df429 (diff) | |
SH-2652 Slightly slower DoF (quality), apply FXAA *after* DoF, fix for some render targets not getting allocated when needed.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl b/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl index c639f25fc6..d2903b545c 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl @@ -47,6 +47,6 @@ void main() vec4 diff = texture2DRect(lightMap, vary_fragcoord.xy); - float a = min(diff.a * max_cof*0.125, 1.0); + float a = min(diff.a * max_cof*0.333, 1.0); gl_FragColor = mix(diff, dof, a); } diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl index bf029d1db5..629648ddc3 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl @@ -73,7 +73,7 @@ void main() { while (sc > 0.5) { - int its = int(max(1.0,(sc*3.7*0.5))); + int its = int(max(1.0,(sc*3.7))); for (int i=0; i<its; ++i) { float ang = sc+i*2*PI/its; // sc is added for rotary perturbance @@ -82,7 +82,7 @@ void main() // you could test sample coords against an interesting non-circular aperture shape here, if desired. dofSample(diff, w, sc, vary_fragcoord.xy + vec2(samp_x,samp_y)); } - sc -= 2.0; + sc -= 1.0; } } |