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/llrender.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/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index ebc4659bcf..eb9da34ca8 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -849,26 +849,32 @@ void LLTexUnit::debugTextureUnit(void) } } -void LLTexUnit::setTextureColorSpace(eTextureColorSpace space) { +void LLTexUnit::setTextureColorSpace(eTextureColorSpace space) +{ mTexColorSpace = space; #if USE_SRGB_DECODE - if (gGLManager.mHasTexturesRGBDecode) { - - if (space == TCS_SRGB) { + if (gGLManager.mHasTexturesRGBDecode) + { + if (space == TCS_SRGB) + { glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_SRGB_DECODE_EXT, GL_DECODE_EXT); } - else { + else + { glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); } - if (gDebugGL) { + if (gDebugGL) + { assert_glerror(); } } + else #endif - glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); - + { + glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + } } LLLightState::LLLightState(S32 index) |