diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-06-09 00:06:59 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-09 00:06:59 +0000 |
commit | 0af856ce9f32e826b889b0ba3b20bef8278dbcfc (patch) | |
tree | 7462ac546d3f94fc5fa5a7acebb250f5eb8ce8a0 /indra/llrender/llrendertarget.cpp | |
parent | afb9c52a00d91c674d1cc48a7b16dd7e2db8cf8f (diff) | |
parent | e19e628b0875a87468851825d516113534b4262f (diff) |
Merged in euclid-SL13281 (pull request #141)
Fix missing srgb conversion for deferred point light specularity
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
-rw-r--r-- | indra/llrender/llrendertarget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 9fb4f7f2b0..e3c0255290 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -501,23 +501,23 @@ U32 LLRenderTarget::getNumTextures() const return mTex.size(); } - void LLRenderTarget::bindTexture(U32 index, S32 channel, LLTexUnit::eTextureFilterOptions filter_options) { - gGL.getTexUnit(channel)->bindManual(mUsage, getTexture(index)); + gGL.getTexUnit(channel)->bindManual(mUsage, getTexture(index)); bool isSRGB = false; llassert(mInternalFormat.size() > index); switch (mInternalFormat[index]) { - case GL_SRGB_ALPHA: case GL_SRGB: + case GL_SRGB8: + case GL_SRGB_ALPHA: case GL_SRGB8_ALPHA8: isSRGB = true; - break; + break; default: - break; + break; } gGL.getTexUnit(channel)->setTextureFilteringOption(filter_options); |