diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-04-26 17:16:28 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-04-26 17:19:29 -0700 |
| commit | e2dc40a76e1a6e191443c213d0f0474d36c83413 (patch) | |
| tree | a32f07a555fed8196f738e7e118af54c770ed16d /indra/newview/lldrawpool.cpp | |
| parent | 369945b45da4697735bea7e925d87c65d90b2a5a (diff) | |
SL-19656 disabling trackAttachments() code after DRTVWR-559 & DRTVWR-539 merge
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 0e050c6f31..edabb55cc3 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -393,6 +393,7 @@ void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, bool texture) LLDrawInfo *pparams = *k; if (pparams) { +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if(pparams->mFace) { LLViewerObject* vobj = pparams->mFace->getViewerObject(); @@ -401,6 +402,7 @@ void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, bool texture) trackAttachments(vobj, false, &ratPtr); } } +#endif pushBatch(*pparams, texture); } } @@ -419,6 +421,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, bool textu LLDrawInfo* pparams = *k; if (pparams) { +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if(pparams->mFace) { LLViewerObject* vobj = pparams->mFace->getViewerObject(); @@ -427,6 +430,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, bool textu trackAttachments( vobj, true ,&ratPtr); } } +#endif if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash) { @@ -451,6 +455,7 @@ void LLRenderPass::pushBatches(U32 type, bool texture, bool batch_textures, bool LLDrawInfo* pparams = *i; LLCullResult::increment_iterator(i, end); +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if(pparams->mFace) { LLViewerObject* vobj = pparams->mFace->getViewerObject(); @@ -459,6 +464,7 @@ void LLRenderPass::pushBatches(U32 type, bool texture, bool batch_textures, bool trackAttachments( vobj, false, &ratPtr); } } +#endif pushBatch(*pparams, texture, batch_textures, reset_gltf); } } @@ -476,6 +482,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, bool texture, bool batch_textures LLDrawInfo* pparams = *i; LLCullResult::increment_iterator(i, end); +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if(pparams->mFace) { LLViewerObject* vobj = pparams->mFace->getViewerObject(); @@ -484,6 +491,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, bool texture, bool batch_textures trackAttachments( vobj, true, &ratPtr); } } +#endif if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)) { @@ -507,6 +515,7 @@ void LLRenderPass::pushMaskBatches(U32 type, bool texture, bool batch_textures, { LLDrawInfo* pparams = *i; LLCullResult::increment_iterator(i, end); +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if((*pparams).mFace) { LLViewerObject* vobj = (*pparams).mFace->getViewerObject(); @@ -515,6 +524,7 @@ void LLRenderPass::pushMaskBatches(U32 type, bool texture, bool batch_textures, trackAttachments( vobj, false, &ratPtr); } } +#endif LLGLSLShader::sCurBoundShaderPtr->setMinimumAlpha(pparams->mAlphaMaskCutoff); pushBatch(*pparams, texture, batch_textures, reset_gltf); reset_gltf = false; @@ -536,6 +546,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, bool texture, bool batch_text LLCullResult::increment_iterator(i, end); llassert(pparams); +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if((*pparams).mFace) { LLViewerObject* vobj = (*pparams).mFace->getViewerObject(); @@ -544,6 +555,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, bool texture, bool batch_text trackAttachments( vobj, true, &ratPtr); } } +#endif if (LLGLSLShader::sCurBoundShaderPtr) { |