Merge branch 'v2' into remove-multicompile-gamma

Author: hkr

PostProcessing/Runtime/Effects/AutoExposure.cs

@@ -24,7 +24,7 @@ public sealed class AutoExposure : PostProcessEffectSettings
         [Range(LogHistogram.rangeMin, LogHistogram.rangeMax), DisplayName("Maximum (EV)"), Tooltip("Maximum average luminance to consider for auto exposure (in EV).")]
         public FloatParameter maxLuminance = new FloatParameter { value = 0f };
 
-        [Min(0f), Tooltip("Exposure bias. Use this to offset the global exposure of the scene.")]
+        [Min(0f), DisplayName("Exposure Compensation"), Tooltip("Use this to scale the global exposure of the scene.")]
         public FloatParameter keyValue = new FloatParameter { value = 1f };
 
         [DisplayName("Type"), Tooltip("Use \"Progressive\" if you want auto exposure to be animated. Use \"Fixed\" otherwise.")]
@@ -97,12 +97,12 @@ public override void Render(PostProcessRenderContext context)
             settings.maxLuminance.value = Mathf.Max(minLum, maxLum);
 
             // Compute average luminance & auto exposure
-            bool isStatic = m_ResetHistory || !Application.isPlaying;
+            bool firstFrame = m_ResetHistory || !Application.isPlaying;
             string adaptation = null;
 
-            if (isStatic)
+            if (firstFrame || settings.eyeAdaptation.value == EyeAdaptation.Fixed)
                 adaptation = "KAutoExposureAvgLuminance_fixed";
-            else if (settings.eyeAdaptation.value == EyeAdaptation.Progressive)
+            else
                 adaptation = "KAutoExposureAvgLuminance_progressive";
 
             var compute = context.resources.computeShaders.autoExposure;
@@ -112,7 +112,7 @@ public override void Render(PostProcessRenderContext context)
             cmd.SetComputeVectorParam(compute, "_Params2", new Vector4(settings.speedDown.value, settings.speedUp.value, settings.keyValue.value, Time.deltaTime));
             cmd.SetComputeVectorParam(compute, "_ScaleOffsetRes", context.logHistogram.GetHistogramScaleOffsetRes(context));
 
-            if (isStatic)
+            if (firstFrame)
             {
                 // We don't want eye adaptation when not in play mode because the GameView isn't
                 // animated, thus making it harder to tweak. Just use the final audo exposure value.

PostProcessing/Runtime/Effects/ColorGrading.cs

@@ -342,7 +342,7 @@ void RenderHDRPipeline2D(PostProcessRenderContext context)
                 lutSheet.properties.SetVector(ShaderIDs.InvGamma, invgamma);
                 lutSheet.properties.SetVector(ShaderIDs.Gain, gain);
 
-                lutSheet.properties.SetTexture(ShaderIDs.Curves, GetCurveTexture(false));
+                lutSheet.properties.SetTexture(ShaderIDs.Curves, GetCurveTexture(true));
 
                 var tonemapper = settings.tonemapper.value;
                 if (tonemapper == Tonemapper.Custom)