diff options
| author | Dave Parks <davep@lindenlab.com> | 2021-12-03 15:07:31 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2021-12-03 15:07:31 +0000 |
| commit | e7830b39f01d9f9c82e9e2029634dffb8386b24e (patch) | |
| tree | 4be81717808f245e62cc7a76b5c148b2096472a1 /indra/llrender/llimagegl.h | |
| parent | 511de439a35ddb22c6f174b85c599d4881b9c139 (diff) | |
SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey textures
Diffstat (limited to 'indra/llrender/llimagegl.h')
| -rw-r--r-- | indra/llrender/llimagegl.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index ae773bb362..28996a554a 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -40,7 +40,8 @@ #include "threadpool.h" #include "workqueue.h" -class LLTextureAtlas ; +#define LL_IMAGEGL_THREAD_CHECK 0 //set to 1 to enable thread debugging for ImageGL + class LLWindow; #define BYTES_TO_MEGA_BYTES(x) ((x) >> 20) @@ -54,7 +55,6 @@ public: // These 2 functions replace glGenTextures() and glDeleteTextures() static void generateTextures(S32 numTextures, U32 *textures); static void deleteTextures(S32 numTextures, const U32 *textures); - static void deleteDeadTextures(); // Size calculation static S32 dataFormatBits(S32 dataformat); @@ -189,6 +189,12 @@ public: BOOL preAddToAtlas(S32 discard_level, const LLImageRaw* raw_image); void postAddToAtlas() ; +#if LL_IMAGEGL_THREAD_CHECK + // thread debugging + std::thread::id mActiveThread; + void checkActiveThread(); +#endif + public: // Various GL/Rendering options S32Bytes mTextureMemory; |