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

submitted to be acceptable

3 files changed, 2 insertions, 24 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];