Merge branch 'ldr-lut-srgb' into v2

Chman · Chman · commit 9557fccdd526 · 2018-03-06T17:43:40.000+01:00
diff --git a/PostProcessing/Shaders/Builtins/Uber.shader b/PostProcessing/Shaders/Builtins/Uber.shader
@@ -215,7 +215,11 @@ Shader "Hidden/PostProcessing/Uber"
             #elif COLOR_GRADING_LDR_2D
             {
                 color = saturate(color);
+
+                // LDR Lut lookup needs to be in sRGB - for HDR stick to linear
+                color.rgb = LinearToSRGB(color.rgb);
                 color.rgb = ApplyLut2D(TEXTURE2D_PARAM(_Lut2D, sampler_Lut2D), color.rgb, _Lut2D_Params);
+                color.rgb = SRGBToLinear(color.rgb);
             }
             #endif
 
diff --git a/PostProcessing/Shaders/Colors.hlsl b/PostProcessing/Shaders/Colors.hlsl
@@ -468,7 +468,7 @@ half3 ApplyLut2D(TEXTURE2D_ARGS(tex, samplerTex), float3 uvw, float3 scaleOffset
 {
     // Strip format where `height = sqrt(width)`
     uvw.z *= scaleOffset.z;
-    half shift = floor(uvw.z);
+    float shift = floor(uvw.z);
     uvw.xy = uvw.xy * scaleOffset.z * scaleOffset.xy + scaleOffset.xy * 0.5;
     uvw.x += shift * scaleOffset.y;
     uvw.xyz = lerp(

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,11 @@ Shader "Hidden/PostProcessing/Uber"`
`215`	`215`	`#elif COLOR_GRADING_LDR_2D`
`216`	`216`	`{`
`217`	`217`	`color = saturate(color);`
	`218`	`+`
	`219`	`+ // LDR Lut lookup needs to be in sRGB - for HDR stick to linear`
	`220`	`+ color.rgb = LinearToSRGB(color.rgb);`
`218`	`221`	`color.rgb = ApplyLut2D(TEXTURE2D_PARAM(_Lut2D, sampler_Lut2D), color.rgb, _Lut2D_Params);`
	`222`	`+ color.rgb = SRGBToLinear(color.rgb);`
`219`	`223`	`}`
`220`	`224`	`#endif`
`221`	`225`
Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ half3 ApplyLut2D(TEXTURE2D_ARGS(tex, samplerTex), float3 uvw, float3 scaleOffset`
`468`	`468`	`{`
`469`	`469`	// Strip format where `height = sqrt(width)`
`470`	`470`	`uvw.z *= scaleOffset.z;`
`471`		`- half shift = floor(uvw.z);`
	`471`	`+ float shift = floor(uvw.z);`
`472`	`472`	`uvw.xy = uvw.xy * scaleOffset.z * scaleOffset.xy + scaleOffset.xy * 0.5;`
`473`	`473`	`uvw.x += shift * scaleOffset.y;`
`474`	`474`	`uvw.xyz = lerp(`