diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-01-27 12:57:30 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-01-27 17:09:29 -0700 |
| commit | 8d0efb54db96c87a2adb4a824998870ff397846e (patch) | |
| tree | 929ccf5fb9d7ce49c3ddd18e179f878cadab4cc5 /indra/newview/llviewermedia.h | |
| parent | 7dcca7f180c2204daefbc3648ebe766a46c7cf85 (diff) | |
SL-16418 rename media tex image per-update to avoid contention stall
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index c2e6564166..03a14421ff 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -269,9 +269,8 @@ public: void scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y); void update(); - bool preUpdateMediaTexture(); void doMediaTexUpdate(); - bool postUpdateMediaTexture(); + void endMediaTexUpdate(); void updateImagesMediaStreams(); LLUUID getMediaTextureID() const; @@ -495,13 +494,13 @@ private: bool mCanceling; private: - LLViewerMediaTexture *updatePlaceholderImage(); + LLViewerMediaTexture *updateMediaImage(); LL::WorkQueue::weak_t mMainQueue; LL::WorkQueue::weak_t mTexUpdateQueue; }; -// Define a worker thread pool for media updates ( LLImageGLThread) +// Define a worker thread pool for media updates (ref LLImageGLThread) class LLMediaTextureUpdateThread : public LLSimpleton<LLMediaTextureUpdateThread>, LL::ThreadPool { public: |