xrRender: apply gamma correction via static_globals cbuffer

res/gamedata/shaders/r5/shared/common.h

@@ -66,6 +66,8 @@ cbuffer	static_globals : register(b2)
 	float4		dev_param_2;
 	float4		dev_param_3;
 	float4		dev_param_4;
+
+	float4		gamma_params;	// x=invGamma, y=brightness, z=contrast
 };
 
 /*

src/Layers/xrRender/FGRenderBase.h

@@ -72,11 +72,11 @@ class FGRenderBase : public IRender, public pureFrame
 
 protected:
     bool b_loaded{ false };
+    CGammaControl m_Gamma;
 
 private:
     void ConvertLegacyAssetsToPBRImpl();
 
-    CGammaControl m_Gamma;
     std::thread m_pbrConversionThread;
 };
 }

src/Layers/xrRender/FSkinnedTypes.h

@@ -44,7 +44,7 @@ inline void q_tc(s16& dst, float val)
 }
 
 #ifdef _DEBUG
-float errN(Fvector3 v, u8* qv)
+inline float errN(Fvector3 v, u8* qv)
 {
     Fvector3 uv;
     uv.set(float(qv[0]), float(qv[1]), float(qv[2])).div(255.f).mul(2.f).sub(1.f);

src/Layers/xrRender/FrameGraphPasses/ShaderConstants.h

@@ -126,8 +126,9 @@ struct alignas(16) StaticGlobals {
     Fvector4 dev_param_2;
     Fvector4 dev_param_3;
     Fvector4 dev_param_4;
+    Fvector4 gamma_params;  // x=invGamma, y=brightness, z=contrast
 };
-static_assert(sizeof(StaticGlobals) == 848, "StaticGlobals must be 848 bytes");
+static_assert(sizeof(StaticGlobals) == 864, "StaticGlobals must be 864 bytes");
 
 // Legacy alias for compatibility
 using GlobalConstants = StaticGlobals;

src/Layers/xrRender/FrameGraphPasses/TonemapPassSetup.cpp

@@ -8,6 +8,7 @@
 #include "Layers/xrRender/FrameGraph/RenderPassBuilder.h"
 #include "Layers/xrRender/FrameGraph/ShaderCache.h"
 #include "Layers/xrRender/RenderContext/RenderContext.h"
+#include "Layers/xrRender/FrameGraphPasses/ShaderConstants.h"
 #include "Layers/xrRender/FrameGraph/ShaderLoader.h"
 #include "Layers/xrRender/RenderContext/RenderDevice.h"
 
@@ -154,8 +155,19 @@ framegraph::VirtualResourceHandle setupTonemapPass(
             if (!vsRefl || !psRefl)
                 return;
 
+            auto staticGlobalsCB = cache.GetOrCreateVolatileCB("Frame", "StaticGlobals",
+                sizeof(passes::StaticGlobals), ctx->GetDevice());
+
+            auto* exposureTexture = fg.GetPhysicalTexture(data.exposureInput);
+            if (!exposureTexture)
+                exposureTexture = ps->fallbackExposureTexture;
+
             framegraph::BindingSetBuilder bsb(*vsRefl, *psRefl, device, "Tonemap");
             bsb.Texture("t_hdr", hdrTexture);
+            if (exposureTexture)
+                bsb.Texture("t_exposure", exposureTexture);
+            if (staticGlobalsCB)
+                bsb.ConstantBuffer("static_globals", staticGlobalsCB);
             auto bindingSet = cache.GetOrCreateBindingSet(bsb.Build(), ps->bindingLayout, device);
             if (!bindingSet)
                 return;

src/Layers/xrRender/r_FrameGraphRenderer.cpp

@@ -493,6 +493,12 @@ void FrameGraphRenderer::Render() {
     auto staticGlobalsCB = cache.GetOrCreateVolatileCB("Frame", "StaticGlobals", sizeof(passes::StaticGlobals), m_device);
     auto staticGlobalsData = passes::BuildStaticGlobals();
 
+    {
+        float G, B, C; Fcolor Balance;
+        m_Gamma.GetIP(G, B, C, Balance);
+        staticGlobalsData.gamma_params.set(1.0f / (G + 0.001f), B, C, 0.0f);
+    }
+
     auto& clm = fg::ClusteredLightManager::Instance();
     if (clm.IsReady() && clm.GetLightCount() > 0) {
         float zNear = VIEWPORT_NEAR;

src/Layers/xrRender/xr_effgamma.h

@@ -25,7 +25,7 @@ class CGammaControl
     void Gamma(float G) { fGamma = G; }
     void Brightness(float B) { fBrightness = B; }
     void Contrast(float C) { fContrast = C; }
-    void GetIP(float& G, float& B, float& C, Fcolor& Balance)
+    void GetIP(float& G, float& B, float& C, Fcolor& Balance) const
     {
         G = fGamma;
         B = fBrightness;

src/xrGame/CharacterPhysicsSupport.cpp

@@ -573,9 +573,8 @@ void CCharacterPhysicsSupport::in_UpdateCL()
 #endif
     update_animation_collision();
     m_character_shell_control.CalculateTimeDelta();
-    if (m_pPhysicsShell)
+    if (m_pPhysicsShell && m_pPhysicsShell->isFullActive())
     {
-        VERIFY(m_pPhysicsShell->isFullActive());
         m_pPhysicsShell->SetRagDoll(); //Теперь шела относиться к классу объектов cbClassRagDoll
 
         if (!is_imotion(m_interactive_motion)) //! m_flags.test(fl_use_death_motion)
@@ -679,9 +678,8 @@ bool CCharacterPhysicsSupport::CollisionCorrectObjPos(const Fvector& start_from,
         box.set(movement()->Box());
     else
     {
-        if (m_pPhysicsShell)
+        if (m_pPhysicsShell && m_pPhysicsShell->isFullActive())
         {
-            VERIFY(m_pPhysicsShell->isFullActive());
             Fvector sz, c;
             get_box(m_pPhysicsShell, mXFORM, sz, c);
             box.setb(Fvector().sub(c, m_EntityAlife.Position()), Fvector(sz).mul(0.5f));