diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-12-03 11:52:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-03 11:52:11 -0500 |
| commit | 6b866bc6432ef88a79a826c09b17107392bde15f (patch) | |
| tree | b3f2d683f23345b142199ce887e8941ca62ad011 /indra/llrender/llglslshader.cpp | |
| parent | 5e7e4dfa3900775a5482d296a8fa648c5805d018 (diff) | |
| parent | bf347d15804c27348c84a55ab763f89b718e8aac (diff) | |
Merge pull request #5094 from secondlife/main
2025.08 -> Develop
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) { |