diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-08 18:52:37 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-08 18:52:46 +0200 |
| commit | cbe606df6b77780fdecf8bdc4007a52d25ff5722 (patch) | |
| tree | 2bf38de402b8c338bdf5dde5798dcf7d15d9a8da /indra/llrender/llglslshader.cpp | |
| parent | 88a3d951fd15863bfd77b9b7137e9c02c21a4a10 (diff) | |
| parent | 49c73ac7297ec7760a00bf36fa6339f2d0be1f95 (diff) | |
Merge branch 'release/2026.01' into maxim/voice-moderation
# Conflicts:
# indra/newview/llviewerstats.h
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 9cd5dc8145..a268ea07bb 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -57,6 +57,7 @@ S32 LLGLSLShader::sIndexedTextureChannels = 0; U32 LLGLSLShader::sMaxGLTFMaterials = 0; U32 LLGLSLShader::sMaxGLTFNodes = 0; bool LLGLSLShader::sProfileEnabled = false; +bool LLGLSLShader::sCanProfile = true; std::set<LLGLSLShader*> LLGLSLShader::sInstances; LLGLSLShader::defines_map_t LLGLSLShader::sGlobalDefines; U64 LLGLSLShader::sTotalTimeElapsed = 0; @@ -267,7 +268,7 @@ void LLGLSLShader::placeProfileQuery(bool for_runtime) bool LLGLSLShader::readProfileQuery(bool for_runtime, bool force_read) { - if (sProfileEnabled || for_runtime) + if ((sProfileEnabled || for_runtime) && sCanProfile) { if (!mProfilePending) { |