diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-26 11:55:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-26 11:55:03 -0500 |
| commit | bb66e722d3ebf62145784227178ccdd318189cf6 (patch) | |
| tree | cc28868865089c9a377e4db16f29e09893ed83e8 /indra/llrender/llrender.cpp | |
| parent | 280a9d9827e4e5e0e1408cc8f9c20ef792a6c714 (diff) | |
| parent | b717a28194eb6e5a2f9113c65abe62cb81141413 (diff) | |
Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rwxr-xr-x | indra/llrender/llrender.cpp | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index c60eb8d9d9..f2f1b62be0 100755 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1849,35 +1849,36 @@ void LLRender::flush() sUIVerts += mCount; } - if (gDebugGL) + //store mCount in a local variable to avoid re-entrance (drawArrays may call flush) + U32 count = mCount; + + if (mMode == LLRender::QUADS && !sGLCoreProfile) { - if (mMode == LLRender::QUADS && !sGLCoreProfile) + if (mCount%4 != 0) { - if (mCount%4 != 0) - { - llerrs << "Incomplete quad rendered." << llendl; - } + count -= (mCount % 4); + llwarns << "Incomplete quad requested." << llendl; } - - if (mMode == LLRender::TRIANGLES) + } + + if (mMode == LLRender::TRIANGLES) + { + if (mCount%3 != 0) { - if (mCount%3 != 0) - { - llerrs << "Incomplete triangle rendered." << llendl; - } + count -= (mCount % 3); + llwarns << "Incomplete triangle requested." << llendl; } - - if (mMode == LLRender::LINES) + } + + if (mMode == LLRender::LINES) + { + if (mCount%2 != 0) { - if (mCount%2 != 0) - { - llerrs << "Incomplete line rendered." << llendl; - } + count -= (mCount % 2); + llwarns << "Incomplete line requested." << llendl; } } - - //store mCount in a local variable to avoid re-entrance (drawArrays may call flush) - U32 count = mCount; + mCount = 0; if (mBuffer->useVBOs() && !mBuffer->isLocked()) |