diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 32d8b105a311da33b64127a36989905b71978ae4..771693f2f0c2ae6567443a8ff3d43c801111a3ec 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 128773df5aafd9312af91681c2d2fdac83a2a5a7..0fb4a7784ab85f28fa92e14cf648215a3cad29e5 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();