diff options
| author | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
| commit | fe518bde8e6db65d3d6b178c200410b1346639a4 (patch) | |
| tree | d738e12f8391a675d36aae9d59ced8104846008c /indra/newview/lldrawpoolmaterials.cpp | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
| parent | d9d46d908c0573dbcd45ec2a1bea56966823343b (diff) | |
merge with release
Diffstat (limited to 'indra/newview/lldrawpoolmaterials.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolmaterials.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index d1b5080650..514411aef5 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -82,12 +82,12 @@ void LLDrawPoolMaterials::beginDeferredPass(S32 pass) diffuse_channel = mShader->enableTexture(LLShaderMgr::DIFFUSE_MAP); - LLFastTimer t(FTM_RENDER_MATERIALS); + LL_RECORD_BLOCK_TIME(FTM_RENDER_MATERIALS); } void LLDrawPoolMaterials::endDeferredPass(S32 pass) { - LLFastTimer t(FTM_RENDER_MATERIALS); + LL_RECORD_BLOCK_TIME(FTM_RENDER_MATERIALS); mShader->unbind(); |