diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-02-11 13:49:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-11 13:49:24 -0500 |
| commit | d450295cf517784744552acb2e885a1657a60f7e (patch) | |
| tree | 0a4d8bf00c8e50d2c05d19384f114b777e7b3a01 /indra/llrender | |
| parent | 6a78b5b43cf14a30130dded0173ab914e282aa23 (diff) | |
Additional water fixes and tweaks. (#3524)
* Incorporation of feedback for #3456
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.h | 1 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 58c456f134..873ab0cff5 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -59,6 +59,7 @@ public: bool attachNothing = false; bool hasHeroProbes = false; bool isPBRTerrain = false; + bool hasTonemap = false; }; // ============= Structure for caching shader uniforms =============== diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 25d8ccd4b3..4807c12226 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -291,6 +291,14 @@ bool LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } } + if (features->hasTonemap) + { + if (!shader->attachFragmentObject("deferred/tonemapUtilF.glsl")) + { + return false; + } + } + // NOTE order of shader object attaching is VERY IMPORTANT!!! if (features->hasAtmospherics) { |