Fixed SAO in non-ambient-only mode

Chman · Chman · commit d9de0d901dca · 2017-08-30T11:44:45.000+02:00
diff --git a/PostProcessing/Shaders/Builtins/ScalableAO.hlsl b/PostProcessing/Shaders/Builtins/ScalableAO.hlsl
@@ -383,9 +383,10 @@ half BlurSmall(TEXTURE2D_ARGS(tex, samp), float2 uv, float2 delta)
 // Final composition shader
 float4 FragComposition(VaryingsDefault i) : SV_Target
 {
-    float2 delta = _MainTex_TexelSize.xy / DOWNSAMPLE;
+    float2 delta = _SAOcclusionTexture_TexelSize.xy / DOWNSAMPLE;
     half ao = BlurSmall(TEXTURE2D_PARAM(_SAOcclusionTexture, sampler_SAOcclusionTexture), i.texcoord, delta);
-    return float4(EncodeAO(ao) * _AOColor, 0.0);
+    ao = EncodeAO(ao);
+    return float4(ao * _AOColor, ao);
 }
 
 #if !SHADER_API_GLES // Excluding the MRT pass under GLES2

Original file line number	Diff line number	Diff line change
`@@ -383,9 +383,10 @@ half BlurSmall(TEXTURE2D_ARGS(tex, samp), float2 uv, float2 delta)`
`383`	`383`	`// Final composition shader`
`384`	`384`	`float4 FragComposition(VaryingsDefault i) : SV_Target`
`385`	`385`	`{`
`386`		`- float2 delta = _MainTex_TexelSize.xy / DOWNSAMPLE;`
	`386`	`+ float2 delta = _SAOcclusionTexture_TexelSize.xy / DOWNSAMPLE;`
`387`	`387`	`half ao = BlurSmall(TEXTURE2D_PARAM(_SAOcclusionTexture, sampler_SAOcclusionTexture), i.texcoord, delta);`
`388`		`- return float4(EncodeAO(ao) * _AOColor, 0.0);`
	`388`	`+ ao = EncodeAO(ao);`
	`389`	`+ return float4(ao * _AOColor, ao);`
`389`	`390`	`}`
`390`	`391`
`391`	`392`	`#if !SHADER_API_GLES // Excluding the MRT pass under GLES2`