diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-01-27 15:41:24 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-01-27 17:10:22 -0700 |
| commit | 7f1832c1ca0a18f34ba993f58ab2e05360bb36fd (patch) | |
| tree | aac54849e7d14d1e87f253946c42459bebeebd47 /indra/newview/llviewermedia.cpp | |
| parent | 8d0efb54db96c87a2adb4a824998870ff397846e (diff) | |
SL-16418 restore tracy macros stomped in merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index de7aaf3173..6c04321539 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2825,7 +2825,7 @@ static LLTrace::BlockTimerStatHandle FTM_MEDIA_SET_SUBIMAGE("Set Subimage"); void LLViewerMediaImpl::update() { - LL_RECORD_BLOCK_TIME(FTM_MEDIA_DO_UPDATE); + LL_PROFILE_ZONE_SCOPED_CATEGORY_MEDIA; //LL_RECORD_BLOCK_TIME(FTM_MEDIA_DO_UPDATE); if(mMediaSource == NULL) { if(mPriority == LLPluginClassMedia::PRIORITY_UNLOADED) @@ -2933,7 +2933,7 @@ void LLViewerMediaImpl::update() ////////////////////////////////////////////////////////////////////////////////////////// void LLViewerMediaImpl::doMediaTexUpdate() { - + LL_PROFILE_ZONE_SCOPED_CATEGORY_MEDIA; LLViewerMediaTexture* media_tex = updateMediaImage(); if (media_tex && mMediaSource) @@ -2970,7 +2970,7 @@ void LLViewerMediaImpl::doMediaTexUpdate() data += (y_pos * media_depth); { - LL_RECORD_BLOCK_TIME(FTM_MEDIA_SET_SUBIMAGE); + LL_PROFILE_ZONE_NAMED_CATEGORY_MEDIA("media set subimage"); //LL_RECORD_BLOCK_TIME(FTM_MEDIA_SET_SUBIMAGE); media_tex->setSubImage( data, data_width, @@ -2993,6 +2993,7 @@ void LLViewerMediaImpl::doMediaTexUpdate() // runs on main thread, but only called when bg thread updates are active void LLViewerMediaImpl::endMediaTexUpdate() { + LL_PROFILE_ZONE_SCOPED_CATEGORY_MEDIA; LLViewerMediaTexture* base_image = LLViewerTextureManager::findMediaTexture(mTextureId); llassert(base_image); @@ -3008,6 +3009,7 @@ void LLViewerMediaImpl::updateImagesMediaStreams() ////////////////////////////////////////////////////////////////////////////////////////// LLViewerMediaTexture* LLViewerMediaImpl::updateMediaImage() { + LL_PROFILE_ZONE_SCOPED_CATEGORY_MEDIA; if (!mMediaSource) { return nullptr; // not ready for updating |