Revert changes for MAINT-2616 due to licensing issues, need a full patch

submitted to be acceptable

6 files changed, 3 insertions, 96 deletions

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 8a0ca95a78..298a03f32a 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -57,7 +57,6 @@ bool LLGLSLShader::sNoFixedFunction = false;
 //UI shader -- declared here so llui_libtest will link properly
 LLGLSLShader	gUIProgram;
 LLGLSLShader	gSolidColorProgram;
-LLGLSLShader	gSolidColorProgramIntel;
 
 BOOL shouldChange(const LLVector4& v1, const LLVector4& v2)
 {
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index cd097b8e0b..019d5a86d6 100755
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -160,8 +160,5 @@ extern LLGLSLShader			gSolidColorProgram;
 //Alpha mask shader (declared here so llappearance can access properly)
 extern LLGLSLShader			gAlphaMaskProgram;
 
-// Solid color Shader for Intel Graphics
-extern LLGLSLShader			gSolidColorProgramIntel;
-
 
 #endif
diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp
index 3c6848efaa..d3cfbaf03a 100644
--- a/indra/llrender/llrender2dutils.cpp
+++ b/indra/llrender/llrender2dutils.cpp
@@ -443,16 +443,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 	{
 		if (LLGLSLShader::sNoFixedFunction)
 		{
-			// When running with a intel gfx card, do not use the solidcolor?.glsl files. Instead use a custom one 
-			// for those cards. Passing color as a uniform and not a shader attribute
-			if(gGLManager.mIsIntel)
-			{
-				gSolidColorProgramIntel.bind();
-			}
-			else
-			{
-				gSolidColorProgram.bind();
-			}
+			gSolidColorProgram.bind();
 		}
 		else
 		{
@@ -463,16 +454,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 
 	gGL.getTexUnit(0)->bind(image, true);
 
-	// When running with a intel gfx card, do not use the solidcolor?.glsl files. Instead use a custom one 
-	// for those cards. Passing color as a uniform and not a shader attribute
-	if( solid_color && LLGLSLShader::sNoFixedFunction && gGLManager.mIsIntel )
-	{
-		gGL.diffuseColor4fv(color.mV);
-	}
-	else
-	{
-		gGL.color4fv(color.mV);
-	}
+	gGL.color4fv(color.mV);
 	
 	const S32 NUM_VERTICES = 9 * 4; // 9 quads
 	LLVector2 uv[NUM_VERTICES];
diff --git a/indra/newview/app_settings/shaders/class1/interface/solidcolorIntelV.glsl b/indra/newview/app_settings/shaders/class1/interface/solidcolorIntelV.glsl
deleted file mode 100644
index dcf38c27ce..0000000000
--- a/indra/newview/app_settings/shaders/class1/interface/solidcolorIntelV.glsl
+++ /dev/null
@@ -1,44 +0,0 @@
-/** 
- * @file solidcolorV.glsl
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2007, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-uniform mat4 modelview_projection_matrix;
-
-uniform vec4 color;
- 
-ATTRIBUTE vec3 position;
-ATTRIBUTE vec4 diffuse_color;
-ATTRIBUTE vec2 texcoord0;
-
-VARYING vec4 vertex_color;
-VARYING vec2 vary_texcoord0;
-
-void main()
-{
-	gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0);
-//	vertex_color = diffuse_color;
-	vertex_color = color;
-	vary_texcoord0 = texcoord0;
-}
-
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 02ace86b95..4681efd3e5 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6051,15 +6051,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
 
 	if (shader)
 	{ //switch to "solid color" program for SH-2690 -- works around driver bug causing bad triangles when rendering silhouettes
-		if(gGLManager.mIsIntel)
-		{
-			gSolidColorProgramIntel.bind();
-			gGL.diffuseColor4fv(color.mV);
-		}
-		else
-		{
-			gSolidColorProgram.bind();
-		}
+		gSolidColorProgram.bind();
 	}
 
 	gGL.matrixMode(LLRender::MM_MODELVIEW);
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index ef5ccb5120..7d7889845d 100755
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -640,7 +640,6 @@ void LLViewerShaderMgr::unloadShaders()
 	gTwoTextureAddProgram.unload();
 	gOneTextureNoColorProgram.unload();
 	gSolidColorProgram.unload();
-	gSolidColorProgramIntel.unload();
 
 	gObjectFullbrightNoColorProgram.unload();
 	gObjectFullbrightNoColorWaterProgram.unload();
@@ -2704,24 +2703,6 @@ BOOL LLViewerShaderMgr::loadShadersInterface()
 		}
 	}
 
-	// When running with a intel gfx card, do not use the solidcolor?.glsl files. Instead use a custom one 
-	// for those cards. Passing color as a uniform and not a shader attribute
-	if (success)
-	{
-		gSolidColorProgramIntel.mName = "Solid Color Shader for Intel";
-		gSolidColorProgramIntel.mShaderFiles.clear();
-		gSolidColorProgramIntel.mShaderFiles.push_back(make_pair("interface/solidcolorIntelV.glsl", GL_VERTEX_SHADER_ARB));
-		gSolidColorProgramIntel.mShaderFiles.push_back(make_pair("interface/solidcolorF.glsl", GL_FRAGMENT_SHADER_ARB)); // The standard fragment shader is just fine. So keep it.
-		gSolidColorProgramIntel.mShaderLevel = mVertexShaderLevel[SHADER_INTERFACE];
-		success = gSolidColorProgramIntel.createShader(NULL, NULL);
-		if (success)
-		{
-			gSolidColorProgramIntel.bind();
-			gSolidColorProgramIntel.uniform1i(sTex0, 0);
-			gSolidColorProgramIntel.unbind();
-		}
-	}
-
 	if (success)
 	{
 		gOcclusionProgram.mName = "Occlusion Shader";