diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-09 16:01:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-09 16:01:07 -0400 |
| commit | 0229b65a4d40287454bd690a414b6ce8f63856ea (patch) | |
| tree | 6eabd292b4b1a5374848fadaff21972ebb597c52 /indra/newview/pipeline.cpp | |
| parent | 8fe17529c672602845cf06cc15d4e776f0b6114a (diff) | |
| parent | 356d738250a872663692876796c043cd04f87d44 (diff) | |
merge changes for fix from geenz
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b9b4ec9198..89df61919e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1327,7 +1327,6 @@ void LLPipeline::createLUTBuffers() // This is fine, given we only need to create our LUT once per buffer initialization. spec *= (((n + 2) * (n + 4)) / (8 * F_PI * (powf(2, -n/2) + n))); - spec = llclamp(spec, 0.f, 1.f); spec = powf(spec, 0.6f); // Since we use R16F, we no longer have a dynamic range issue we need to work around here. @@ -1353,7 +1352,7 @@ void LLPipeline::createLUTBuffers() } } - LLImageGL::generateTextures(LLTexUnit::TT_TEXTURE, GL_R8, 1, &mLightFunc); + LLImageGL::generateTextures(LLTexUnit::TT_TEXTURE, GL_R16F, 1, &mLightFunc); gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mLightFunc); LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, GL_R16F, lightResX, lightResY, GL_RED, GL_FLOAT, ls, false); //LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, GL_UNSIGNED_BYTE, lightResX, lightResY, GL_RED, GL_UNSIGNED_BYTE, ls, false); |