diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-05 15:53:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-05 15:53:03 -0500 |
| commit | 6a3cb427071641585d9beb44c3e46a148f90a791 (patch) | |
| tree | dae00c85fc3515216a0b3bbace5a99eded542b5e /indra/llrender/llvertexbuffer.cpp | |
| parent | b811b22c4aad589d5428f9d5fa5b43c60840b039 (diff) | |
| parent | 6d48db868f7459fcf5f0e89d830a844e409d4163 (diff) | |
merge changes for 3.7.22-release
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rwxr-xr-x | indra/llrender/llvertexbuffer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index d06564df36..0fae600a90 100755 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -843,9 +843,11 @@ void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const { LL_RECORD_BLOCK_TIME(FTM_GL_DRAW_ARRAYS); stop_glerror(); - LLGLSLShader::startProfile(); + LLGLSLShader::startProfile(); + stop_glerror(); glDrawArrays(sGLMode[mode], first, count); - LLGLSLShader::stopProfile(count, mode); + stop_glerror(); + LLGLSLShader::stopProfile(count, mode); } stop_glerror(); |