Merge branch 'main' into 2025.06

1 files changed, 75 insertions, 3 deletions

diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 7ef13c3a35..43cb7d8a14 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -137,6 +137,10 @@ LLGLSLShader            gGlowProgram;
 LLGLSLShader            gGlowExtractProgram;
 LLGLSLShader            gPostScreenSpaceReflectionProgram;
 
+LLGLSLShader            gBloomExtractProgram;
+LLGLSLShader            gBloomBlurProgram;
+LLGLSLShader            gBloomCombineProgram;
+
 // Deferred rendering shaders
 LLGLSLShader            gDeferredImpostorProgram;
 LLGLSLShader            gDeferredDiffuseProgram;
@@ -198,6 +202,7 @@ LLGLSLShader            gDeferredPostTonemapProgram;
 LLGLSLShader            gNoPostTonemapProgram;
 LLGLSLShader            gDeferredPostGammaCorrectProgram;
 LLGLSLShader            gLegacyPostGammaCorrectProgram;
+LLGLSLShader            gHDRGammaCorrectProgram;
 LLGLSLShader            gExposureProgram;
 LLGLSLShader            gExposureProgramNoFade;
 LLGLSLShader            gLuminanceProgram;
@@ -445,6 +450,7 @@ void LLViewerShaderMgr::finalizeShaderList()
     mShaderList.push_back(&gNoPostTonemapProgram);
     mShaderList.push_back(&gDeferredPostGammaCorrectProgram); // for gamma
     mShaderList.push_back(&gLegacyPostGammaCorrectProgram);
+    mShaderList.push_back(&gHDRGammaCorrectProgram);
     mShaderList.push_back(&gDeferredDiffuseProgram);
     mShaderList.push_back(&gDeferredBumpProgram);
     mShaderList.push_back(&gDeferredPBROpaqueProgram);
@@ -802,9 +808,12 @@ std::string LLViewerShaderMgr::loadBasicShaders()
 
     if (shadow_detail >= 1)
     {
-        attribs["SUN_SHADOW"] = "1";
+        if(shadow_detail < 3)
+        {
+            attribs["SUN_SHADOW"] = "1";
+        }
 
-        if (shadow_detail >= 2)
+        if (shadow_detail > 1)
         {
             attribs["SPOT_SHADOW"] = "1";
         }
@@ -902,8 +911,9 @@ bool LLViewerShaderMgr::loadShadersWater()
     bool success = true;
     bool terrainWaterSuccess = true;
 
+    S32 shadow_detail = gSavedSettings.getS32("RenderShadowDetail");
     bool use_sun_shadow = mShaderLevel[SHADER_DEFERRED] > 1 &&
-        gSavedSettings.getS32("RenderShadowDetail") > 0;
+        shadow_detail > 0 && shadow_detail < 3;
 
     if (mShaderLevel[SHADER_WATER] == 0)
     {
@@ -1003,6 +1013,52 @@ bool LLViewerShaderMgr::loadShadersEffects()
 
     if (success)
     {
+        gBloomExtractProgram.mName = "Bloom Extract Shader";
+        gBloomExtractProgram.mShaderFiles.clear();
+        gBloomExtractProgram.mShaderFiles.push_back(make_pair("effects/bloomExtractV.glsl", GL_VERTEX_SHADER));
+        gBloomExtractProgram.mShaderFiles.push_back(make_pair("effects/bloomExtractF.glsl", GL_FRAGMENT_SHADER));
+        gBloomExtractProgram.mShaderLevel = mShaderLevel[SHADER_EFFECT];
+
+        success = gBloomExtractProgram.createShader();
+        if (!success)
+        {
+            LL_WARNS() << "gBloomExtractProgram creation ERROR" << LL_ENDL;
+            //LLPipeline::sRenderGlow = false;
+        }
+    }
+
+    if (success)
+    {
+        gBloomBlurProgram.mName = "Bloom Blur Shader";
+        gBloomBlurProgram.mShaderFiles.clear();
+        gBloomBlurProgram.mShaderFiles.push_back(make_pair("effects/bloomBlurV.glsl", GL_VERTEX_SHADER));
+        gBloomBlurProgram.mShaderFiles.push_back(make_pair("effects/bloomBlurF.glsl", GL_FRAGMENT_SHADER));
+        gBloomBlurProgram.mShaderLevel = mShaderLevel[SHADER_EFFECT];
+
+        success = gBloomBlurProgram.createShader();
+        if(!success)
+        {
+            LL_WARNS() << "gBloomBlurProgram creation ERROR" << LL_ENDL;
+        }
+    }
+
+    if (success)
+    {
+        gBloomCombineProgram.mName = "Bloom Combine Shader";
+        gBloomCombineProgram.mShaderFiles.clear();
+        gBloomCombineProgram.mShaderFiles.push_back(make_pair("effects/bloomCombineV.glsl", GL_VERTEX_SHADER));
+        gBloomCombineProgram.mShaderFiles.push_back(make_pair("effects/bloomCombineF.glsl", GL_FRAGMENT_SHADER));
+        gBloomCombineProgram.mShaderLevel = mShaderLevel[SHADER_EFFECT];
+
+        success = gBloomCombineProgram.createShader();
+        if(!success)
+        {
+            LL_WARNS() << "gBloomCombineProgram creation ERROR" << LL_ENDL;
+        }
+    }
+
+    if (success)
+    {
         gGlowProgram.mName = "Glow Shader (Post)";
         gGlowProgram.mShaderFiles.clear();
         gGlowProgram.mShaderFiles.push_back(make_pair("effects/glowV.glsl", GL_VERTEX_SHADER));
@@ -1107,6 +1163,7 @@ bool LLViewerShaderMgr::loadShadersDeferred()
         gLuminanceProgram.unload();
         gDeferredPostGammaCorrectProgram.unload();
         gLegacyPostGammaCorrectProgram.unload();
+        gHDRGammaCorrectProgram.unload();
         gDeferredPostTonemapProgram.unload();
         gNoPostTonemapProgram.unload();
         for (auto i = 0; i < 4; ++i)
@@ -2450,6 +2507,21 @@ bool LLViewerShaderMgr::loadShadersDeferred()
 
     if (success)
     {
+        gHDRGammaCorrectProgram.mName = "HDR Gamma Correction Post Process";
+        gHDRGammaCorrectProgram.mFeatures.hasSrgb = true;
+        gHDRGammaCorrectProgram.mFeatures.isDeferred = true;
+        gHDRGammaCorrectProgram.mShaderFiles.clear();
+        gHDRGammaCorrectProgram.clearPermutations();
+        //gHDRGammaCorrectProgram.addPermutation("HDR_GAMMA", "1");
+        gHDRGammaCorrectProgram.mShaderFiles.push_back(make_pair("deferred/postDeferredNoTCV.glsl", GL_VERTEX_SHADER));
+        gHDRGammaCorrectProgram.mShaderFiles.push_back(make_pair("deferred/MPHDRDisplayGammaF.glsl", GL_FRAGMENT_SHADER));
+        gHDRGammaCorrectProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED];
+        success = gHDRGammaCorrectProgram.createShader();
+        llassert(success);
+    }
+
+    if (success)
+    {
         gDeferredPostTonemapProgram.mName = "Deferred Tonemap Post Process";
         gDeferredPostTonemapProgram.mFeatures.hasSrgb = true;
         gDeferredPostTonemapProgram.mFeatures.isDeferred = true;