diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-17 19:02:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-17 19:02:21 -0500 |
| commit | 861b7eba60ab71c5f9c68e46e207d8767d3e07f7 (patch) | |
| tree | 5e3aec2c887d4c6b2976095713de2b8792c3f8b7 /indra/llrender | |
| parent | 421e52ff98b67398843482713d754678a7153f50 (diff) | |
SH-2243 fix for mac build
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 4 | ||||
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 32d8b105a3..771693f2f0 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1787,17 +1787,13 @@ LLGLState::LLGLState(LLGLenum state, S32 enabled) : switch (state) { case GL_ALPHA_TEST: - case GL_RESCALE_NORMAL: case GL_NORMALIZE: case GL_TEXTURE_GEN_R: case GL_TEXTURE_GEN_S: case GL_TEXTURE_GEN_T: case GL_TEXTURE_GEN_Q: - case GL_VERTEX_PROGRAM_TWO_SIDE: case GL_LIGHTING: case GL_COLOR_MATERIAL: - case GL_CLAMP_VERTEX_COLOR: - case GL_CLAMP_FRAGMENT_COLOR: case GL_FOG: case GL_LINE_STIPPLE: mState = 0; diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 128773df5a..0fb4a7784a 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -725,7 +725,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) } else if (!is_compressed) { - if (mAutoGenMips && !LLGLSLShader::sNoFixedFunction) //auto-generating mipmaps is deprecated in GL 3.0 + if (mAutoGenMips) //auto-generating mipmaps is deprecated in GL 3.0 { glTexParameteri(LLTexUnit::getInternalType(mBindTarget), GL_GENERATE_MIPMAP_SGIS, TRUE); stop_glerror(); |