summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp43
1 files changed, 3 insertions, 40 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 2687ccfae2..40112421cd 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6452,6 +6452,7 @@ void LLPipeline::renderObjects(U32 type, bool texture, bool batch_texture, bool
assertInitialized();
gGL.loadMatrix(gGLModelView);
gGLLastMatrix = NULL;
+
if (rigged)
{
mSimplePool->pushRiggedBatches(type + 1, texture, batch_texture);
@@ -6460,40 +6461,9 @@ void LLPipeline::renderObjects(U32 type, bool texture, bool batch_texture, bool
{
mSimplePool->pushBatches(type, texture, batch_texture);
}
- gGL.loadMatrix(gGLModelView);
- gGLLastMatrix = NULL;
-}
-
-void LLPipeline::renderShadowSimple(U32 type)
-{
- LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE;
- assertInitialized();
- gGL.loadMatrix(gGLModelView);
- gGLLastMatrix = NULL;
-
- LLVertexBuffer* last_vb = nullptr;
-
- LLCullResult::drawinfo_iterator begin = gPipeline.beginRenderMap(type);
- LLCullResult::drawinfo_iterator end = gPipeline.endRenderMap(type);
-
- for (LLCullResult::drawinfo_iterator i = begin; i != end; )
- {
- LLDrawInfo& params = **i;
-
- LLCullResult::increment_iterator(i, end);
- LLVertexBuffer* vb = params.mVertexBuffer;
- if (vb != last_vb)
- {
- LL_PROFILE_ZONE_NAMED_CATEGORY_PIPELINE("push shadow simple");
- mSimplePool->applyModelMatrix(params);
- vb->setBuffer();
- vb->drawRange(LLRender::TRIANGLES, 0, vb->getNumVerts()-1, vb->getNumIndices(), 0);
- last_vb = vb;
- }
- }
gGL.loadMatrix(gGLModelView);
- gGLLastMatrix = NULL;
+ gGLLastMatrix = NULL;
}
// Currently only used for shadows -Cosmic,2023-04-19
@@ -8624,14 +8594,7 @@ void LLPipeline::renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera
for (U32 type : types)
{
- if (rigged)
- {
- renderObjects(type, false, false, rigged);
- }
- else
- {
- renderShadowSimple(type);
- }
+ renderObjects(type, false, false, rigged);
}
gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);