aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpool.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:59 -0500
committerJacek Antonelli2008-08-15 23:44:59 -0500
commita408bac29378072fbf36864164149458c978cfcc (patch)
tree67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/newview/lldrawpool.cpp
parentSecond Life viewer sources 1.17.0.12 (diff)
downloadmeta-impy-a408bac29378072fbf36864164149458c978cfcc.zip
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2
meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz
Second Life viewer sources 1.17.1.0
Diffstat (limited to 'linden/indra/newview/lldrawpool.cpp')
-rw-r--r--linden/indra/newview/lldrawpool.cpp17
1 files changed, 11 insertions, 6 deletions
diff --git a/linden/indra/newview/lldrawpool.cpp b/linden/indra/newview/lldrawpool.cpp
index 4a1794e..0ab5b54 100644
--- a/linden/indra/newview/lldrawpool.cpp
+++ b/linden/indra/newview/lldrawpool.cpp
@@ -486,15 +486,20 @@ void LLRenderPass::renderInvisible(U32 mask)
486 486
487 std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[LLRenderPass::PASS_INVISIBLE]; 487 std::vector<LLDrawInfo*>& draw_info = gPipeline.mRenderMap[LLRenderPass::PASS_INVISIBLE];
488 488
489 U32* indices_pointer = NULL;
490 for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i) 489 for (std::vector<LLDrawInfo*>::iterator i = draw_info.begin(); i != draw_info.end(); ++i)
491 { 490 {
492 LLDrawInfo& params = **i; 491 LLDrawInfo& params = **i;
493 params.mVertexBuffer->setBuffer(mask); 492
494 indices_pointer = (U32*) params.mVertexBuffer->getIndicesPointer(); 493 if (params.mVertexBuffer)
495 glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd, params.mCount, 494 {
496 GL_UNSIGNED_INT, indices_pointer+params.mOffset); 495 params.mVertexBuffer->setBuffer(mask);
497 gPipeline.mTrianglesDrawn += params.mCount/3; 496 U32 *indices_pointer =
497 (U32 *) params.mVertexBuffer->getIndicesPointer();
498 glDrawRangeElements(GL_TRIANGLES, params.mStart, params.mEnd,
499 params.mCount, GL_UNSIGNED_INT,
500 indices_pointer + params.mOffset);
501 gPipeline.mTrianglesDrawn += params.mCount / 3;
502 }
498 } 503 }
499} 504}
500 505