diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-07 09:39:50 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-07 09:39:50 -0600 |
| commit | dd17170abb08cb4ec8ebc8c7e5f38d3ad1519538 (patch) | |
| tree | 1ecbcab7e68354b01632843a9c8777a1c435fd3c /indra/llrender | |
| parent | b9b913a60ada97fc61bf2176e443dc72c8359ccb (diff) | |
| parent | c51f8b82482f7bd8c45ccc65733dd5d5eef2f076 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 9fb5eef3a2..e5e6882ba1 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1363,7 +1363,8 @@ void LLVertexBuffer::setBuffer() U32 data_mask = LLGLSLShader::sCurBoundShaderPtr->mAttributeMask; // this Vertex Buffer must provide all necessary attributes for currently bound shader - llassert((data_mask & mTypeMask) == data_mask); + llassert_msg((data_mask & mTypeMask) == data_mask, + "Attribute mask mismatch! mTypeMask should be a superset of data_mask. data_mask: 0x" << std::hex << data_mask << " mTypeMask: 0x" << mTypeMask << std::dec); if (sGLRenderBuffer != mGLBuffer) { |