diff options
| author | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
| commit | d26567915cd80999260edffc41df467a7cbbd80c (patch) | |
| tree | 84072d2a7a5e6afa7b57850ed4b325439cb2be16 /indra/llrender/llimagegl.cpp | |
| parent | 7528855442a100cee379b9e409280a69caa78bba (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge with Master after Viewer release
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 3b6a49735e..0151d20128 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1386,6 +1386,15 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S return FALSE; } + if (mHasExplicitFormat && + ((mFormatPrimary == GL_RGBA && mComponents < 4) || + (mFormatPrimary == GL_RGB && mComponents < 3))) + + { + LL_WARNS() << "Incorrect format: " << std::hex << mFormatPrimary << " components: " << (U32)mComponents << LL_ENDL; + mHasExplicitFormat = FALSE; + } + if( !mHasExplicitFormat ) { switch (mComponents) |