Skip to content
Snippets Groups Projects
Commit e2dc40a7 authored by Brad Linden's avatar Brad Linden
Browse files

SL-19656 disabling trackAttachments() code after DRTVWR-559 & DRTVWR-539 merge

parent 369945b4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/lldrawpool.cpp
+ 12
− 0
View file @ e2dc40a7
...@@ -393,6 +393,7 @@ void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, bool texture) ...@@ -393,6 +393,7 @@ void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, bool texture)
LLDrawInfo *pparams = *k; LLDrawInfo *pparams = *k;
if (pparams) if (pparams)
{ {
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(pparams->mFace) if(pparams->mFace)
{ {
LLViewerObject* vobj = pparams->mFace->getViewerObject(); LLViewerObject* vobj = pparams->mFace->getViewerObject();
...@@ -401,6 +402,7 @@ void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, bool texture) ...@@ -401,6 +402,7 @@ void LLRenderPass::renderGroup(LLSpatialGroup* group, U32 type, bool texture)
trackAttachments(vobj, false, &ratPtr); trackAttachments(vobj, false, &ratPtr);
} }
} }
#endif
pushBatch(*pparams, texture); pushBatch(*pparams, texture);
} }
} }
...@@ -419,6 +421,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, bool textu ...@@ -419,6 +421,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, bool textu
LLDrawInfo* pparams = *k; LLDrawInfo* pparams = *k;
if (pparams) if (pparams)
{ {
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(pparams->mFace) if(pparams->mFace)
{ {
LLViewerObject* vobj = pparams->mFace->getViewerObject(); LLViewerObject* vobj = pparams->mFace->getViewerObject();
...@@ -427,6 +430,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, bool textu ...@@ -427,6 +430,7 @@ void LLRenderPass::renderRiggedGroup(LLSpatialGroup* group, U32 type, bool textu
trackAttachments( vobj, true ,&ratPtr); trackAttachments( vobj, true ,&ratPtr);
} }
} }
#endif
if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash) if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)
{ {
...@@ -451,6 +455,7 @@ void LLRenderPass::pushBatches(U32 type, bool texture, bool batch_textures, bool ...@@ -451,6 +455,7 @@ void LLRenderPass::pushBatches(U32 type, bool texture, bool batch_textures, bool
LLDrawInfo* pparams = *i; LLDrawInfo* pparams = *i;
LLCullResult::increment_iterator(i, end); LLCullResult::increment_iterator(i, end);
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(pparams->mFace) if(pparams->mFace)
{ {
LLViewerObject* vobj = pparams->mFace->getViewerObject(); LLViewerObject* vobj = pparams->mFace->getViewerObject();
...@@ -459,6 +464,7 @@ void LLRenderPass::pushBatches(U32 type, bool texture, bool batch_textures, bool ...@@ -459,6 +464,7 @@ void LLRenderPass::pushBatches(U32 type, bool texture, bool batch_textures, bool
trackAttachments( vobj, false, &ratPtr); trackAttachments( vobj, false, &ratPtr);
} }
} }
#endif
pushBatch(*pparams, texture, batch_textures, reset_gltf); pushBatch(*pparams, texture, batch_textures, reset_gltf);
} }
} }
...@@ -476,6 +482,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, bool texture, bool batch_textures ...@@ -476,6 +482,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, bool texture, bool batch_textures
LLDrawInfo* pparams = *i; LLDrawInfo* pparams = *i;
LLCullResult::increment_iterator(i, end); LLCullResult::increment_iterator(i, end);
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(pparams->mFace) if(pparams->mFace)
{ {
LLViewerObject* vobj = pparams->mFace->getViewerObject(); LLViewerObject* vobj = pparams->mFace->getViewerObject();
...@@ -484,6 +491,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, bool texture, bool batch_textures ...@@ -484,6 +491,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, bool texture, bool batch_textures
trackAttachments( vobj, true, &ratPtr); trackAttachments( vobj, true, &ratPtr);
} }
} }
#endif
if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)) 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, ...@@ -507,6 +515,7 @@ void LLRenderPass::pushMaskBatches(U32 type, bool texture, bool batch_textures,
{ {
LLDrawInfo* pparams = *i; LLDrawInfo* pparams = *i;
LLCullResult::increment_iterator(i, end); LLCullResult::increment_iterator(i, end);
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if((*pparams).mFace) if((*pparams).mFace)
{ {
LLViewerObject* vobj = (*pparams).mFace->getViewerObject(); LLViewerObject* vobj = (*pparams).mFace->getViewerObject();
...@@ -515,6 +524,7 @@ void LLRenderPass::pushMaskBatches(U32 type, bool texture, bool batch_textures, ...@@ -515,6 +524,7 @@ void LLRenderPass::pushMaskBatches(U32 type, bool texture, bool batch_textures,
trackAttachments( vobj, false, &ratPtr); trackAttachments( vobj, false, &ratPtr);
} }
} }
#endif
LLGLSLShader::sCurBoundShaderPtr->setMinimumAlpha(pparams->mAlphaMaskCutoff); LLGLSLShader::sCurBoundShaderPtr->setMinimumAlpha(pparams->mAlphaMaskCutoff);
pushBatch(*pparams, texture, batch_textures, reset_gltf); pushBatch(*pparams, texture, batch_textures, reset_gltf);
reset_gltf = false; reset_gltf = false;
...@@ -536,6 +546,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, bool texture, bool batch_text ...@@ -536,6 +546,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, bool texture, bool batch_text
LLCullResult::increment_iterator(i, end); LLCullResult::increment_iterator(i, end);
llassert(pparams); llassert(pparams);
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if((*pparams).mFace) if((*pparams).mFace)
{ {
LLViewerObject* vobj = (*pparams).mFace->getViewerObject(); LLViewerObject* vobj = (*pparams).mFace->getViewerObject();
...@@ -544,6 +555,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, bool texture, bool batch_text ...@@ -544,6 +555,7 @@ void LLRenderPass::pushRiggedMaskBatches(U32 type, bool texture, bool batch_text
trackAttachments( vobj, true, &ratPtr); trackAttachments( vobj, true, &ratPtr);
} }
} }
#endif
if (LLGLSLShader::sCurBoundShaderPtr) if (LLGLSLShader::sCurBoundShaderPtr)
{ {
......
indra/newview/lldrawpoolalpha.cpp
+ 6
− 0
View file @ e2dc40a7
...@@ -354,6 +354,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) ...@@ -354,6 +354,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask)
{ {
LLDrawInfo& params = **k; LLDrawInfo& params = **k;
# if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(params.mFace) if(params.mFace)
{ {
LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
...@@ -362,6 +363,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) ...@@ -362,6 +363,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask)
trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
} }
} }
#endif
bool rigged = (params.mAvatar != nullptr); bool rigged = (params.mAvatar != nullptr);
gHighlightProgram.bind(rigged); gHighlightProgram.bind(rigged);
...@@ -550,11 +552,13 @@ void LLDrawPoolAlpha::renderRiggedEmissives(std::vector<LLDrawInfo*>& emissives) ...@@ -550,11 +552,13 @@ void LLDrawPoolAlpha::renderRiggedEmissives(std::vector<LLDrawInfo*>& emissives)
for (LLDrawInfo* draw : emissives) for (LLDrawInfo* draw : emissives)
{ {
LL_PROFILE_ZONE_NAMED_CATEGORY_DRAWPOOL("Emissives"); LL_PROFILE_ZONE_NAMED_CATEGORY_DRAWPOOL("Emissives");
# if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
auto vobj = draw->mFace?draw->mFace->getViewerObject():nullptr; auto vobj = draw->mFace?draw->mFace->getViewerObject():nullptr;
if(vobj && vobj->isAttachment()) if(vobj && vobj->isAttachment())
{ {
trackAttachments( vobj, draw->mFace->isState(LLFace::RIGGED), &ratPtr ); trackAttachments( vobj, draw->mFace->isState(LLFace::RIGGED), &ratPtr );
} }
#endif
bool tex_setup = TexSetup(draw, false); bool tex_setup = TexSetup(draw, false);
if (lastAvatar != draw->mAvatar || lastMeshId != draw->mSkinInfo->mHash) if (lastAvatar != draw->mAvatar || lastMeshId != draw->mSkinInfo->mHash)
...@@ -696,6 +700,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) ...@@ -696,6 +700,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged)
LLRenderPass::applyModelMatrix(params); LLRenderPass::applyModelMatrix(params);
# if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(params.mFace) if(params.mFace)
{ {
LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
...@@ -705,6 +710,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) ...@@ -705,6 +710,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged)
trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
} }
} }
#endif
LLMaterial* mat = NULL; LLMaterial* mat = NULL;
LLGLTFMaterial *gltf_mat = params.mGLTFMaterial; LLGLTFMaterial *gltf_mat = params.mGLTFMaterial;
......
indra/newview/lldrawpoolbump.cpp
+ 6
− 1
View file @ e2dc40a7
...@@ -411,12 +411,13 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, bool texture = ...@@ -411,12 +411,13 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, bool texture =
{ {
LLDrawInfo& params = **k; LLDrawInfo& params = **k;
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
if( vobj && vobj->isAttachment() ) if( vobj && vobj->isAttachment() )
{ {
trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
} }
#endif
applyModelMatrix(params); applyModelMatrix(params);
...@@ -574,6 +575,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass) ...@@ -574,6 +575,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass)
LLCullResult::increment_iterator(i, end); LLCullResult::increment_iterator(i, end);
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(params.mFace) if(params.mFace)
{ {
LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
...@@ -583,6 +585,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass) ...@@ -583,6 +585,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass)
trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
} }
} }
#endif
LLGLSLShader::sCurBoundShaderPtr->setMinimumAlpha(params.mAlphaMaskCutoff); LLGLSLShader::sCurBoundShaderPtr->setMinimumAlpha(params.mAlphaMaskCutoff);
LLDrawPoolBump::bindBumpMap(params, bump_channel); LLDrawPoolBump::bindBumpMap(params, bump_channel);
...@@ -1217,6 +1220,7 @@ void LLDrawPoolBump::pushBumpBatches(U32 type) ...@@ -1217,6 +1220,7 @@ void LLDrawPoolBump::pushBumpBatches(U32 type)
{ {
LLDrawInfo& params = **i; LLDrawInfo& params = **i;
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(params.mFace) if(params.mFace)
{ {
LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
...@@ -1226,6 +1230,7 @@ void LLDrawPoolBump::pushBumpBatches(U32 type) ...@@ -1226,6 +1230,7 @@ void LLDrawPoolBump::pushBumpBatches(U32 type)
trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
} }
} }
#endif
if (LLDrawPoolBump::bindBumpMap(params)) if (LLDrawPoolBump::bindBumpMap(params))
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment