QAR-1142 merging 1.22 RC0-RC4 changes.

svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge

1 files changed, 1 insertions, 34 deletions

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index fa763bf2f8..aced88f1a2 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -263,7 +263,6 @@ LLGLManager::LLGLManager() :
 	mHasMultitexture(FALSE),
 	mNumTextureUnits(1),
 	mHasMipMapGeneration(FALSE),
-	mHasPalettedTextures(FALSE),
 	mHasCompressedTextures(FALSE),
 	mHasFramebufferObject(FALSE),
 
@@ -566,7 +565,6 @@ void LLGLManager::initExtensions()
 	mHasFramebufferObject = FALSE;
 # endif
 	mHasMipMapGeneration = FALSE;
-	mHasPalettedTextures = FALSE;
 	mHasSeparateSpecularColor = FALSE;
 	mHasAnisotropic = FALSE;
 	mHasCubeMap = FALSE;
@@ -578,7 +576,6 @@ void LLGLManager::initExtensions()
 #else // LL_MESA_HEADLESS
 	mHasMultitexture = glh_init_extensions("GL_ARB_multitexture");
 	mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap");
-	mHasPalettedTextures = glh_init_extension("GL_EXT_paletted_texture");
 	mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color");
 	mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic");
 	glh_init_extensions("GL_ARB_texture_cube_map");
@@ -610,7 +607,6 @@ void LLGLManager::initExtensions()
 		mHasVertexBufferObject = FALSE;
 		mHasFramebufferObject = FALSE;
 		mHasMipMapGeneration = FALSE;
-		mHasPalettedTextures = FALSE;
 		mHasSeparateSpecularColor = FALSE;
 		mHasAnisotropic = FALSE;
 		mHasCubeMap = FALSE;
@@ -628,7 +624,6 @@ void LLGLManager::initExtensions()
 		// bug reports.  This should be the default until we get a
 		// proper blacklist/whitelist on Linux.
 		mHasMipMapGeneration = FALSE;
-		mHasPalettedTextures = FALSE;
 		mHasAnisotropic = FALSE;
 		//mHasCubeMap = FALSE; // apparently fatal on Intel 915 & similar
 		//mHasOcclusionQuery = FALSE; // source of many ATI system hangs
@@ -648,7 +643,6 @@ void LLGLManager::initExtensions()
 		if (strchr(blacklist,'b')) mHasCompressedTextures = FALSE;
 		if (strchr(blacklist,'c')) mHasVertexBufferObject = FALSE;
 		if (strchr(blacklist,'d')) mHasMipMapGeneration = FALSE;//S
-		if (strchr(blacklist,'e')) mHasPalettedTextures = FALSE;//S
 // 		if (strchr(blacklist,'f')) mHasNVVertexArrayRange = FALSE;//S
 // 		if (strchr(blacklist,'g')) mHasNVFence = FALSE;//S
 		if (strchr(blacklist,'h')) mHasSeparateSpecularColor = FALSE;
@@ -663,13 +657,6 @@ void LLGLManager::initExtensions()
 		if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
 	}
 #endif // LL_LINUX
-
-#if LL_DARWIN || LL_LINUX
-	// MBW -- 12/4/2003 -- Using paletted textures causes a bunch of avatar rendering problems on the Mac.
-	// Not sure if this is due to driver problems or incorrect use of the extension, but I'm disabling it for now.
-	// Tofu - 2006-10-03 -- Same problem on Linux.
-	mHasPalettedTextures = false;
-#endif
 	
 	if (!mHasMultitexture)
 	{
@@ -683,10 +670,6 @@ void LLGLManager::initExtensions()
 	{
 		LL_INFOS("RenderInit") << "Couldn't initialize GL_ARB_texture_env_combine" << LL_ENDL;
 	}
-	if (!mHasPalettedTextures)
-	{
-		LL_INFOS("RenderInit") << "Couldn't initialize GL_EXT_paletted_texture" << LL_ENDL;
-	}
 	if (!mHasSeparateSpecularColor)
 	{
 		LL_INFOS("RenderInit") << "Couldn't initialize separate specular color" << LL_ENDL;
@@ -788,13 +771,7 @@ void LLGLManager::initExtensions()
 		mGLMaxIndexRange = 0;
 	}
 #endif // !LL_LINUX
-#if LL_LINUX
-	// On Linux we need to get glColorTableEXT dynamically.
-	if (mHasPalettedTextures)
-	{
-		glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)GLH_EXT_GET_PROC_ADDRESS("glColorTableEXT");
-	}
-#endif // LL_LINUX
+
 	if (mHasOcclusionQuery)
 	{
 		glGenQueriesARB = (PFNGLGENQUERIESARBPROC)GLH_EXT_GET_PROC_ADDRESS("glGenQueriesARB");
@@ -1442,16 +1419,6 @@ void set_binormals(const S32 index, const U32 stride,const LLVector3 *binormals)
 #endif
 }
 
-
-void set_palette(U8 *palette_data)
-{
-	if (gGLManager.mHasPalettedTextures)
-	{
-		glColorTableEXT(GL_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette_data);
-	}
-}
-
-
 void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific )
 {
 	// GL_VERSION returns a null-terminated string with the format: