diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-11-19 10:49:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-19 10:49:09 -0800 |
| commit | 7be9c43f286671893ff0a9dee13d721a6731255b (patch) | |
| tree | b49f62290187b2b719d1fb3b2cdbb467c64b4bfd /indra/llrender/llrender.cpp | |
| parent | c654dac4b7593355a5754042d0b43e03924b3efb (diff) | |
brad/2744 handle shader errors (#3105)
* Partial solution to secondlife/viewer#2744 crash with better error handling.
Handles shader compile errors better, and should turn crash into an LL_ERRS assertion failure.
Strengthed more assertions and improved shader error line numbers
* Even more error handling to get a handle on crash secondlife/viewer#2744
* Improved GLSL correctness on Intel chips that lack OpenGL 4.6 support. secondlife/viewer#2744
* Removed non-working fallback code for gDeferredPostProgram
* Fixed incorrect llmax call
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index c8a9fb4893..eb2cd560a6 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1569,7 +1569,8 @@ void LLRender::flush() if (mCount > 0) { LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE; - llassert(LLGLSLShader::sCurBoundShaderPtr != nullptr); + llassert_always(LLGLSLShader::sCurBoundShaderPtr != nullptr); + if (!mUIOffset.empty()) { sUICalls++; |