diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 8bc4e14188..196e898a62 100644 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -84,34 +84,9 @@ LLImageDecodeThread::handle_t LLImageDecodeThread::decodeImage(LLImageFormatted* U32 priority, S32 discard, BOOL needs_aux, Responder* responder) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; - // De-couple texture threading from mainloop - // LLMutexLock lock(mCreationMutex); - // handle_t handle = generateHandle(); - // mCreationList.push_back(creation_info(handle, image, priority, discard, needs_aux, responder)); + LLMutexLock lock(mCreationMutex); handle_t handle = generateHandle(); - // If we have a thread pool dispatch this directly. - // Note: addRequest could cause the handling to take place on the fetch thread, this is unlikely to be an issue. - // if this is an actual problem we move the fallback to here and place the unfulfilled request into the legacy queue - if (s_ChildThreads > 0) - { - LL_PROFILE_ZONE_NAMED_COLOR("DecodeDecoupled", tracy::Color::Orange); // instrument the image decode pipeline - ImageRequest* req = new ImageRequest(handle, image, - priority, discard, needs_aux, - responder, this); - bool res = addRequest(req); - if (!res) - { - LL_WARNS() << "Decode request not added because we are exiting." << LL_ENDL; - return 0; - } - } - else - { - LL_PROFILE_ZONE_NAMED_COLOR("DecodeQueued", tracy::Color::Orange); // instrument the image decode pipeline - LLMutexLock lock(mCreationMutex); - mCreationList.push_back(creation_info(handle, image, priority, discard, needs_aux, responder)); - } - // + mCreationList.push_back(creation_info(handle, image, priority, discard, needs_aux, responder)); return handle; }