From 33ccdea7617b05bef22e8484ad1fa0d0d6d464ce Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 12 Sep 2024 09:02:48 +0200
Subject: [PATCH] Fixes and shader update

#2673
---
 Content/Shaders/ColorGrading.flax             |  4 ++--
 .../Graphics/GPUPipelineStatePermutations.h   |  3 +++
 Source/Engine/Renderer/ColorGradingPass.h     |  2 +-
 Source/Shaders/ColorGrading.shader            | 21 +++++++------------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Content/Shaders/ColorGrading.flax b/Content/Shaders/ColorGrading.flax
index c797e5b26..269dfa4a2 100644
--- a/Content/Shaders/ColorGrading.flax
+++ b/Content/Shaders/ColorGrading.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e378171320ebc1c7516832a15576254d403508e1ae1e14c9af5cf30c75f231cc
-size 10629
+oid sha256:304d96b72a53d4faa8bb6945b4d3a92199e5493c110e23d60e76a2c926149a47
+size 12322
diff --git a/Source/Engine/Graphics/GPUPipelineStatePermutations.h b/Source/Engine/Graphics/GPUPipelineStatePermutations.h
index e3306fa92..44214056a 100644
--- a/Source/Engine/Graphics/GPUPipelineStatePermutations.h
+++ b/Source/Engine/Graphics/GPUPipelineStatePermutations.h
@@ -39,11 +39,13 @@ public:
 
     FORCE_INLINE GPUPipelineState* Get(int index) const
     {
+        ASSERT_LOW_LAYER(index >= 0 && index < Size);
         return States[index];
     }
 
     FORCE_INLINE GPUPipelineState*& operator[](int32 index)
     {
+        ASSERT_LOW_LAYER(index >= 0 && index < Size);
         return States[index];
     }
 
@@ -129,6 +131,7 @@ public:
 public:
     FORCE_INLINE GPUShaderProgramCS* Get(const int index) const
     {
+        ASSERT_LOW_LAYER(index >= 0 && index < Size);
         return Shaders[index];
     }
 
diff --git a/Source/Engine/Renderer/ColorGradingPass.h b/Source/Engine/Renderer/ColorGradingPass.h
index 39968a4e6..7da9a20df 100644
--- a/Source/Engine/Renderer/ColorGradingPass.h
+++ b/Source/Engine/Renderer/ColorGradingPass.h
@@ -15,7 +15,7 @@ private:
     bool _useVolumeTexture;
     PixelFormat _lutFormat;
     AssetReference<Shader> _shader;
-    GPUPipelineStatePermutationsPs<3> _psLut;
+    GPUPipelineStatePermutationsPs<4> _psLut;
 
 public:
 
diff --git a/Source/Shaders/ColorGrading.shader b/Source/Shaders/ColorGrading.shader
index cd5d0faf6..59de00aa2 100644
--- a/Source/Shaders/ColorGrading.shader
+++ b/Source/Shaders/ColorGrading.shader
@@ -193,9 +193,10 @@ float3 TonemapACES(float3 linearColor)
 
 #endif
 
-#ifdef TONE_MAPPING_MODE_NEUTRAL
+#ifdef TONE_MAPPING_MODE_AGX
 
-float3 agxAscCdl(float3 color, float3 slope, float3 offset, float3 power, float sat) {
+float3 agxAscCdl(float3 color, float3 slope, float3 offset, float3 power, float sat)
+{
     const float3 lw = float3(0.2126, 0.7152, 0.0722);
     float luma = dot(color, lw);
     float3 c = pow(color * slope + offset, power);
@@ -209,27 +210,23 @@ float3 TonemapAGX(float3 linearColor)
         0.0951, 0.7612, 0.0768,
         0.0483, 0.1014, 0.8113
     };
-
     static const float3x3 AgXOutsetMatrix = {
         1.1271, -0.1413, -0.1413,
         -0.1106, 1.1578, -0.1106,
         -0.0165, -0.0165, 1.2519
     };
-
     static const float AgxMinEv = -12.47393;
     static const float AgxMaxEv = 4.026069;
 
-	float3 color = linearColor;
+    float3 color = linearColor;
     color = mul(color, AgXInsetMatrix);
     color = max(color, 1e-10);
     color = clamp(log2(color), AgxMinEv, AgxMaxEv);
     color = (color - AgxMinEv) / (AgxMaxEv - AgxMinEv);
-
-    color = clamp(color, 0.0, 1.0);
+    color = saturate(color);
 
     float3 x2 = color * color;
     float3 x4 = x2 * x2;    
-
     color = + 15.5      * x4 * x2
             - 40.14     * x4 * color
             + 31.96     * x4
@@ -239,14 +236,10 @@ float3 TonemapAGX(float3 linearColor)
             - 0.00232;
 
     // color = agxAscCdl(color, float3(1.0, 1.0, 1.0), float3(0.0, 0.0, 0.0), float3(1.35, 1.35, 1.35), 1.4);
-
     color = mul(color, AgXOutsetMatrix);
-
     color = pow(max(float3(0.0, 0.0, 0.0), color), float3(2.2, 2.2, 2.2));
-
-    color = clamp(color, 0.0, 1.0);
-
-	return color;
+    color = saturate(color);
+    return color;
 }
 
 #endif