diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-20 14:24:48 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-20 14:24:48 +0800 |
| commit | 9e282949a79fe56b12a4fdfa8fa4552338d8a370 (patch) | |
| tree | 7cfc28e52827565f6955a0bdc9ecf20d6ff65d3b /indra/llrender/llglslshader.cpp | |
| parent | 84240037a2c1c7032fe2fdacec7099eabdfe24ac (diff) | |
| parent | 6c6b38821ef0ea452b640b31006a8ef4f2dfef55 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index e79d67c5c7..f6539b8d03 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -1084,7 +1084,7 @@ void LLGLSLShader::bind() { LL_PROFILE_ZONE_SCOPED_CATEGORY_SHADER; - llassert(mProgramObject != 0); + llassert_always(mProgramObject != 0); gGL.flush(); @@ -1107,6 +1107,9 @@ void LLGLSLShader::bind() LLShaderMgr::instance()->updateShaderUniforms(this); mUniformsDirty = false; } + + llassert_always(sCurBoundShaderPtr != nullptr); + llassert_always(sCurBoundShader == mProgramObject); } void LLGLSLShader::bind(U8 variant) |