summaryrefslogtreecommitdiff
path: root/indra/llrender/llcubemap.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-02 13:49:35 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-02 13:49:35 -0700
commitc4032528aff8ef1938e897ec583bbf25a3e713e1 (patch)
tree4addd3b6619e6e911898d09ef446d0d40ef8a73e /indra/llrender/llcubemap.cpp
parent1ff876a961dc00b7f162054ea1a9fed79240bffc (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/llcubemap.cpp')
-rw-r--r--indra/llrender/llcubemap.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp
index d425b8fa2d..5947bca670 100644
--- a/indra/llrender/llcubemap.cpp
+++ b/indra/llrender/llcubemap.cpp
@@ -79,9 +79,11 @@ void LLCubeMap::initGL()
for (int i = 0; i < 6; i++)
{
mImages[i] = new LLImageGL(RESOLUTION, RESOLUTION, 4, FALSE);
+ #if USE_SRGB_DECODE
if (mIssRGB) {
mImages[i]->setExplicitFormat(GL_SRGB8_ALPHA8, GL_RGBA);
}
+ #endif
mImages[i]->setTarget(mTargets[i], LLTexUnit::TT_CUBE_MAP);
mRawImages[i] = new LLImageRaw(RESOLUTION, RESOLUTION, 4);
mImages[i]->createGLTexture(0, mRawImages[i], texname);