diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-02-22 14:58:50 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-02-22 14:58:50 -0600 |
| commit | 1c5c45f27317d6ee7c2c30de11f43aeee3855434 (patch) | |
| tree | 2b62d6c4bbc228db6788ddf54f55d4e2a42a2fba /indra/newview | |
| parent | 1461e4d437996784cc8afe5d4b3bfa873d3dbfa1 (diff) | |
SL-16815 Fix for broken media texture updates when multithreaded GL is disabled.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 7d03cb7609..0a0cfc5cdf 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1311,11 +1311,6 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI if (main_queue) { //dispatch creation to background thread - LLImageRaw* dst_ptr = dst_image; - LLViewerTexture* bump_ptr = bump; - dst_ptr->ref(); - bump_ptr->ref(); - main_queue->postTo(sTexUpdateQueue, create_texture, gen_normal_map); } else diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 4fc1bdbec3..6a2b06d9b5 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -788,6 +788,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLViewerTexture::updateClass(); } + LLImageGLThread::updateClass(); + { LL_RECORD_BLOCK_TIME(FTM_IMAGE_UPDATE_BUMP); gBumpImageList.updateImages(); // must be called before gTextureList version so that it's textures are thrown out first. |