diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2023-04-28 09:48:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-28 09:48:02 -0700 |
| commit | b21e16f27d215cd2e564af7c48cba86459d07645 (patch) | |
| tree | ebccf636e37fd64fd08435f20c220f037ceec97d /indra/newview/lldrawpoolmaterials.cpp | |
| parent | f5cf0cf876c3e69aa9b378b3f363f39679f4b7a4 (diff) | |
| parent | 97c6bf8f743ef4956d7d706e26f25ce6f32182b4 (diff) | |
Merge pull request #198 from secondlife/DRTVWR-559-merge-539
DRTVWR-559 merge 539
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index 6a7e05ac74..e025651cce 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -32,6 +32,7 @@ #include "pipeline.h" #include "llglcommonfunc.h" #include "llvoavatar.h" +#include "llperfstats.h" LLDrawPoolMaterials::LLDrawPoolMaterials() : LLRenderPass(LLDrawPool::POOL_MATERIALS) @@ -150,6 +151,7 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) LLCullResult::drawinfo_iterator begin = gPipeline.beginRenderMap(type); LLCullResult::drawinfo_iterator end = gPipeline.endRenderMap(type); + std::unique_ptr<LLPerfStats::RecordAttachmentTime> ratPtr{}; F32 lastIntensity = 0.f; F32 lastFullbright = 0.f; F32 lastMinimumAlpha = 0.f; @@ -199,6 +201,18 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) LLCullResult::increment_iterator(i, end); +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() + if(params.mFace) + { + LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); + + if( vobj && vobj->isAttachment() ) + { + trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); + } + } +#endif + if (specular > -1 && params.mSpecColor != lastSpecular) { lastSpecular = params.mSpecColor; |