diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-12-12 11:57:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-12 11:57:07 -0800 |
| commit | 24bb1e58f87bbc42ec006d1eb107091c709b6de3 (patch) | |
| tree | 99031882ec6fd39473d8b67f5cb06f8d38d8be2f /indra/llrender/llglslshader.cpp | |
| parent | 43341b7aa9c883066c6d31da929cc30732da66f9 (diff) | |
| parent | f4eec813a3043e2277ae62da6a829c65887d0785 (diff) | |
Merge branch 'develop' into rider/privileged_land
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) { |