diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-26 12:05:25 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-26 12:05:25 +0800 |
| commit | a40795bd6ffcfff71bead4869d79cf5a73d5a7af (patch) | |
| tree | 6c4c1fbb421f737c0b62fcda51ca7ca0ce8294f4 /indra/llrender/llimagegl.cpp | |
| parent | 30842e230e2b3d365e8415f0350f8d10ce8b0637 (diff) | |
| parent | d65fb7cec8ce36ce7f6ff082f8d04bdd8bc0208c (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 08c05a0771..d0d55b8526 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -259,8 +259,8 @@ void LLImageGL::initClass(LLWindow* window, S32 num_catagories, bool skip_analyz if (thread_texture_loads || thread_media_updates) { LLImageGLThread::createInstance(window); - LLImageGLThread::sEnabledTextures = thread_texture_loads; - LLImageGLThread::sEnabledMedia = thread_media_updates; + LLImageGLThread::sEnabledTextures = gGLManager.mGLVersion > 3.95f ? thread_texture_loads : false; + LLImageGLThread::sEnabledMedia = gGLManager.mGLVersion > 3.95f ? thread_media_updates : false; } } @@ -350,6 +350,7 @@ S32 LLImageGL::dataFormatBits(S32 dataformat) case GL_RGB8: return 24; case GL_RGBA: return 32; case GL_RGBA8: return 32; + case GL_RGB10_A2: return 32; #if GL_VERSION_2_1 case GL_SRGB_ALPHA: return 32; case GL_BGRA: return 32; // Used for QuickTime media textures on the Mac |