From b86f472b15ed95d2e097c2422f0554d5e4531c43 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 13 Mar 2023 19:05:27 -0400
Subject: [PATCH] Fix glow
---
indra/newview/alrenderutils.cpp | 4 ++--
.../app_settings/shaders/class1/alchemy/toneMapF.glsl | 9 +++------
indra/newview/pipeline.cpp | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/indra/newview/alrenderutils.cpp b/indra/newview/alrenderutils.cpp
index f8fa8d0a8ca..90336bae854 100644
--- a/indra/newview/alrenderutils.cpp
+++ b/indra/newview/alrenderutils.cpp
@@ -530,10 +530,10 @@ void ALRenderUtil::renderTonemap(LLRenderTarget* src, LLRenderTarget* dst, LLRen
if (bloom)
{
- channel = tone_shader->enableTexture(LLShaderMgr::DEFERRED_BLOOM, bloom->getUsage());
+ channel = tone_shader->enableTexture(LLShaderMgr::DEFERRED_EMISSIVE, bloom->getUsage());
if (channel > -1)
{
- bloom->bindTexture(0, channel);
+ bloom->bindTexture(0, channel, LLTexUnit::TFO_BILINEAR);
}
}
diff --git a/indra/newview/app_settings/shaders/class1/alchemy/toneMapF.glsl b/indra/newview/app_settings/shaders/class1/alchemy/toneMapF.glsl
index d21cce5f22e..31d3f3bcdc4 100644
--- a/indra/newview/app_settings/shaders/class1/alchemy/toneMapF.glsl
+++ b/indra/newview/app_settings/shaders/class1/alchemy/toneMapF.glsl
@@ -33,7 +33,7 @@ out vec4 frag_color;
in vec2 vary_fragcoord;
uniform sampler2D diffuseRect;
-uniform sampler2D bloomMap;
+uniform sampler2D emissiveRect;
uniform vec2 screen_res;
uniform float exposure;
@@ -293,11 +293,8 @@ vec3 legacyGamma(vec3 color)
void main()
{
- vec4 diff = texture(diffuseRect, vary_fragcoord);
-
- // vec4 bloom = texture(bloomMap, vary_fragcoord.xy/screen_res);
- // diff.rgb += bloom.rgb;
-
+ vec4 diff = texture(diffuseRect, vary_fragcoord) + texture2D(emissiveRect, vary_fragcoord);
+
#if TONEMAP_METHOD != 0
// Exposure adjustment
diff.rgb *= exposure;
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 71559c5a2a7..c7fdf880d5a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7470,7 +7470,7 @@ void LLPipeline::renderFinalize()
dst.flush();
}
#if 1
- mALRenderUtil->renderTonemap(screenTarget(),screenTarget(),nullptr);
+ mALRenderUtil->renderTonemap(screenTarget(),screenTarget(),&mGlow[1]);
mALRenderUtil->renderSharpen(screenTarget(),screenTarget());
#else
--
GitLab