summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2019-03-29 02:51:41 -0700
committerGeenz <geenz@geenzo.com>2019-03-29 02:51:41 -0700
commit3fa8b844c39311a2e4e319a8d4f7ab2c848ae140 (patch)
tree286b6ccf73bc961093d609da0ff5e21c8ef6c11c /indra/newview
parent2bbb6c7e027ae12d18bef5db2cdc3e7ba41e8630 (diff)
Fixing gamma correction in EEP Step 1:
Thou shall always read the sky cubemap as sRGB using hardware sampling.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvosky.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 96363045d3..8bcd875d90 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -207,6 +207,9 @@ void LLSkyTex::create(const F32 brightness)
void LLSkyTex::createGLImage(S32 which)
{
+ if (LLPipeline::RenderDeferred) {
+ mTexture[which]->setExplicitFormat(GL_SRGB8_ALPHA8, GL_RGBA);
+ }
mTexture[which]->createGLTexture(0, mImageRaw[which], 0, TRUE, LLGLTexture::LOCAL);
mTexture[which]->setAddressMode(LLTexUnit::TAM_CLAMP);
}
@@ -613,7 +616,9 @@ void LLVOSky::initCubeMap()
}
else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)
{
- mCubeMap = new LLCubeMap();
+ bool wantsRGB = LLPipeline::RenderDeferred;
+
+ mCubeMap = new LLCubeMap(wantsRGB);
mCubeMap->init(images);
}
gGL.getTexUnit(0)->disable();