diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-02 13:49:35 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-02 13:49:35 -0700 |
| commit | c4032528aff8ef1938e897ec583bbf25a3e713e1 (patch) | |
| tree | 4addd3b6619e6e911898d09ef446d0d40ef8a73e /indra/llrender/llrender.cpp | |
| parent | 1ff876a961dc00b7f162054ea1a9fed79240bffc (diff) | |
Roll back sRGB decode changes from contrib for now.
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 5dc61d0e8f..f3771f3bf2 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -193,6 +193,7 @@ void LLTexUnit::enable(eTextureType type) stop_glerror(); } mCurrTexType = type; + gGL.flush(); if (!LLGLSLShader::sNoFixedFunction && type != LLTexUnit::TT_MULTISAMPLE_TEXTURE && @@ -850,6 +851,8 @@ void LLTexUnit::debugTextureUnit(void) void LLTexUnit::setTextureColorSpace(eTextureColorSpace space) { mTexColorSpace = space; + +#if USE_SRGB_DECODE if (gGLManager.mHasTexturesRGBDecode) { if (space == TCS_SRGB) { @@ -863,6 +866,9 @@ void LLTexUnit::setTextureColorSpace(eTextureColorSpace space) { assert_glerror(); } } +#endif + glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + } LLLightState::LLLightState(S32 index) |