diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-05-03 20:52:10 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-05-03 20:52:10 +0000 |
| commit | 217c6a86ec61963578ce3eb0c76ff3a96e63a995 (patch) | |
| tree | dab3c478a6a0e85abb19b36e4c89ea21da8c2a8a /indra/llrender/llimagegl.cpp | |
| parent | f67fe8fce7d84bc8687d409311518565d97a5fc5 (diff) | |
| parent | 89c24095c6c1b778b93a4eb7ad398627f4d5479f (diff) | |
Merged in graham_linden/viewer-eep-rc-fixes (pull request #378)
SL-11087, SL-11086, SL-11092, SL-11075, SL-11070, SL-11090, SL-11085
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 2f1f702d2c..790ba25112 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1385,22 +1385,28 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S mFormatType = GL_UNSIGNED_BYTE; break; case 3: + #if USE_SRGB_DECODE if (gGLManager.mHasTexturesRGBDecode) { mFormatInternal = GL_SRGB8; } - else { + else + #endif + { mFormatInternal = GL_RGB8; } mFormatPrimary = GL_RGB; mFormatType = GL_UNSIGNED_BYTE; break; case 4: + #if USE_SRGB_DECODE if (gGLManager.mHasTexturesRGBDecode) { mFormatInternal = GL_SRGB8_ALPHA8; } - else { + else + #endif + { mFormatInternal = GL_RGBA8; } mFormatPrimary = GL_RGBA; |