summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-02-22 19:48:01 -0600
committerDave Parks <davep@lindenlab.com>2022-02-22 19:48:01 -0600
commit74641a121316a13e106d525fb1684c517791766d (patch)
treecebff8187d51369cc498d669184f5c046ca3a28d /indra/llrender
parentce534cf32e1df84b6b10435e9604b0cbde6abf95 (diff)
SL-16815 Cleanup -- disable multithreaded bumpmap generation while tracking down loading issues, fix sync issue in single threaded mode in media textures, restore LL_IMAGEGL_THREAD_CHECK functionality
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llimagegl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 10fdd7c9a9..9e26247e1e 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1644,6 +1644,8 @@ void LLImageGLThread::updateClass()
void LLImageGL::syncToMainThread(LLGLuint new_tex_name)
{
LL_PROFILE_ZONE_SCOPED;
+ llassert(!on_main_thread());
+
{
LL_PROFILE_ZONE_NAMED("cglt - sync");
if (gGLManager.mHasSync)