summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-29 20:20:56 -0500
committerDave Parks <davep@lindenlab.com>2011-09-29 20:20:56 -0500
commit754ce2be40ed53e8f925c21879305c9749adeb0d (patch)
tree014b9cc4cbfcf3fe1addce5ff29d86abe397e49f
parent97a86da85e2a83441f17208091b4b3b9ce6f6337 (diff)
SH-2477 Integrate Tofu's FXAA edge threshold tweaks
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl4
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl4
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcdc5a63d2..01dd7a0735 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1097,6 +1097,7 @@ Tofu Buzzard
CTS-411
STORM-546
VWR-24509
+ SH-2477
Tony Kembia
Torben Trautman
TouchaHoney Perhaps
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
index fb574359ac..7588073a9c 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl
@@ -2217,8 +2217,8 @@ void main()
rcp_frame_opt, //fxaaConsoleRcpFrameOpt2
rcp_frame_opt2, //fxaaConsole360RcpFrameOpt2
0.75, //fxaaQualitySubpix
- 0.166, //fxaaQualityEdgeThreshold
- 0.0833, //fxaaQualityEdgeThresholdMin
+ 0.07, //fxaaQualityEdgeThreshold
+ 0.03, //fxaaQualityEdgeThresholdMin
8.0, //fxaaConsoleEdgeSharpness
0.125, //fxaaConsoleEdgeThreshold
0.05, //fxaaConsoleEdgeThresholdMin
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl
index 066dfba5d9..1f1057d8f7 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl
@@ -2102,8 +2102,8 @@ void main()
rcp_frame_opt, //fxaaConsoleRcpFrameOpt2
rcp_frame_opt2, //fxaaConsole360RcpFrameOpt2
0.75, //fxaaQualitySubpix
- 0.166, //fxaaQualityEdgeThreshold
- 0.0833, //fxaaQualityEdgeThresholdMin
+ 0.07, //fxaaQualityEdgeThreshold
+ 0.03, //fxaaQualityEdgeThresholdMin
8.0, //fxaaConsoleEdgeSharpness
0.125, //fxaaConsoleEdgeThreshold
0.05, //fxaaConsoleEdgeThresholdMin