livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-2243 fix for mac build

meow-7.2.2
Dave Parks 2011-09-17 19:02:21 -05:00
parent 421e52ff98
commit 861b7eba60
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llgl.cpp
View File

@ -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;

2
indra/llrender/llimagegl.cpp
View File

@ -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();