diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-01-20 13:00:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-01-20 13:00:57 -0600 |
| commit | 10c85eab94dbd63fec62cfbf484a9c62c5a0f5cd (patch) | |
| tree | 50ec987bb70f0e045e1056d182c563e6b0f93655 /indra | |
| parent | c83e66414848e468cce01d36c1054b2e9314baf9 (diff) | |
| parent | d8cdfaa645e68a496f7c5957602a28cbc2db5f53 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index db17f812bd..b3b79bd6c4 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1428,6 +1428,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt { case GL_UNSIGNED_BYTE: case GL_BYTE: + case GL_UNSIGNED_INT_8_8_8_8_REV: type_width = 1; break; case GL_UNSIGNED_SHORT: diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index b9e68bd6a9..91f1af8f28 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -267,11 +267,7 @@ void LLManipTranslate::restoreGL() } } } -#ifdef LL_WINDOWS LLImageGL::setManualImage(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, GL_RGBA, GL_UNSIGNED_BYTE, d); -#else - LLImageGL::setManualImage(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, d); -#endif rez = rez >> 1; mip++; } |