diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index da69205ca84ef6926784fccf07a37ebdb2dbc47a..0f8af6267e2257ef58eba7927421308298211a72 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1423,6 +1423,8 @@ void LLGLManager::initExtensions()
     mHasCubeMapArray = mGLVersion >= 3.99f; 
     mHasTransformFeedback = mGLVersion >= 3.99f;
     mHasDebugOutput = mGLVersion >= 4.29f;
+    mHasGPUShader4  = mGLVersion >= 3.0f;
+    mHasTextureSwizzle = mGLVersion >= 3.29f;
 
     // Misc
 	glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, (GLint*) &mGLMaxVertexRange);
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index e274b15a3e6d5a98ac8152d89ed9b8215e04cc09..533205e8e72416b5230d31597e55281819e9371f 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -94,10 +94,8 @@ class LLGLManager
 	bool mHasCubeMapArray = false;
 	bool mHasDebugOutput = false;
     bool mHasTransformFeedback = false;
-    bool mHasAnisotropic = false;
     bool mHasTextureSwizzle = false;
     bool mHasGPUShader4  = false;
-    bool mHasClipControl = false;
 	bool mHasAdaptiveVSync = false;
 	
 	// Vendor-specific extensions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index d04f1c51f9bfa6ea53ed81dcbe8a1fc2e234b350..9a50b4d44842e7568196a84ca5958ea29031ecb2 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1283,7 +1283,6 @@ void LLImageGL::deleteTextures(S32 numTextures, const U32 *textures)
 void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 width, S32 height, U32 pixformat, U32 pixtype, const void* pixels, bool allow_compression)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-	std::vector<U32> scratch;
     if (LLRender::sGLCoreProfile)
     {
 #ifdef GL_ARB_texture_swizzle
@@ -1316,6 +1315,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
 		else
 #endif
 		{
+			std::vector<U32> scratch;
 			if (pixformat == GL_ALPHA && pixtype == GL_UNSIGNED_BYTE)
 			{ //GL_ALPHA is deprecated, convert to RGBA
 				try