summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-06-24 19:30:52 -0700
committerGraham Linden <graham@lindenlab.com>2013-06-24 19:30:52 -0700
commit363ef9d73d71a9bcf2698525ac5371eb7d3b00a8 (patch)
tree54915c756fdcfd6919caec15ea5f61ccb123ad99
parentc07f47dee88db5e041648b38d92b173cce65aa9f (diff)
parent4841eaddb9dcfe6c6290f430121a6407b4ebe322 (diff)
Merge
-rwxr-xr-xindra/newview/pipeline.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index d37b086ae3..9713f963b9 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1400,13 +1400,9 @@ void LLPipeline::createLUTBuffers()
ls[y*lightResX+x] = k;*/
}
}
-
- U32 pix_format = GL_R16F;
-#if LL_DARWIN
// Need to work around limited precision with 10.6.8 and older drivers
//
- pix_format = GL_R32F;
-#endif
+ U32 pix_format = GL_R32F;
LLImageGL::generateTextures(LLTexUnit::TT_TEXTURE, pix_format, 1, &mLightFunc);
gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mLightFunc);
LLImageGL::setManualImage(LLTexUnit::getInternalType(LLTexUnit::TT_TEXTURE), 0, pix_format, lightResX, lightResY, GL_RED, GL_FLOAT, ls, false);