SL-19148 Decruft followthrough -- one more dead shader

4 files changed, 0 insertions, 106 deletions

diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl
deleted file mode 100644
index 7a35905280..0000000000
--- a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarF.glsl
+++ /dev/null
@@ -1,40 +0,0 @@
-/** 
- * @file pickAvatarF.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$
- */
-
-#ifdef DEFINE_GL_FRAGCOLOR
-out vec4 frag_color;
-#else
-#define frag_color gl_FragColor
-#endif
-
-VARYING vec4 vertex_color;
-VARYING vec2 vary_texcoord0;
-
-uniform sampler2D diffuseMap;
-
-void main() 
-{
-	frag_color = vec4(vertex_color.rgb, texture2D(diffuseMap, vary_texcoord0.xy).a);
-}
diff --git a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl b/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl
deleted file mode 100644
index 78b5328c9a..0000000000
--- a/indra/newview/app_settings/shaders/class1/avatar/pickAvatarV.glsl
+++ /dev/null
@@ -1,50 +0,0 @@
-/** 
- * @file pickAvatarV.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 projection_matrix;
-
-ATTRIBUTE vec3 position;
-ATTRIBUTE vec4 diffuse_color;
-ATTRIBUTE vec2 texcoord0;
-
-VARYING vec4 vertex_color;
-VARYING vec2 vary_texcoord0;
-
-mat4 getSkinnedTransform();
-
-void main()
-{
-	vec4 pos;
-	vec4 pos_in = vec4(position, 1.0);
-	mat4 trans = getSkinnedTransform();
-	pos.x = dot(trans[0], pos_in);
-	pos.y = dot(trans[1], pos_in);
-	pos.z = dot(trans[2], pos_in);
-	pos.w = 1.0;
-			
-	vertex_color = diffuse_color;
-	vary_texcoord0 = texcoord0;
-	gl_Position = projection_matrix * pos;
-}
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 7b7ad96425..23cb32357c 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -117,7 +117,6 @@ LLGLSLShader		gPathfindingNoNormalsProgram;
 LLGLSLShader		gAvatarProgram;
 LLGLSLShader		gAvatarWaterProgram;
 LLGLSLShader		gAvatarEyeballProgram;
-LLGLSLShader		gAvatarPickProgram;
 LLGLSLShader		gImpostorProgram;
 
 // Effects Shaders
@@ -571,7 +570,6 @@ void LLViewerShaderMgr::unloadShaders()
 	gAvatarProgram.unload();
 	gAvatarWaterProgram.unload();
 	gAvatarEyeballProgram.unload();
-	gAvatarPickProgram.unload();
 	gHighlightProgram.unload();
     gSkinnedHighlightProgram.unload();
 	gHighlightNormalProgram.unload();
@@ -2825,7 +2823,6 @@ BOOL LLViewerShaderMgr::loadShadersAvatar()
 		gAvatarProgram.unload();
 		gAvatarWaterProgram.unload();
 		gAvatarEyeballProgram.unload();
-		gAvatarPickProgram.unload();
 		return TRUE;
 	}
 
@@ -2875,18 +2872,6 @@ BOOL LLViewerShaderMgr::loadShadersAvatar()
 
 	if (success)
 	{
-		gAvatarPickProgram.mName = "Avatar Pick Shader";
-		gAvatarPickProgram.mFeatures.hasSkinning = true;
-		gAvatarPickProgram.mFeatures.disableTextureIndex = true;
-		gAvatarPickProgram.mShaderFiles.clear();
-		gAvatarPickProgram.mShaderFiles.push_back(make_pair("avatar/pickAvatarV.glsl", GL_VERTEX_SHADER));
-		gAvatarPickProgram.mShaderFiles.push_back(make_pair("avatar/pickAvatarF.glsl", GL_FRAGMENT_SHADER));
-		gAvatarPickProgram.mShaderLevel = mShaderLevel[SHADER_AVATAR];
-		success = gAvatarPickProgram.createShader(NULL, NULL);
-	}
-
-	if (success)
-	{
 		gAvatarEyeballProgram.mName = "Avatar Eyeball Program";
 		gAvatarEyeballProgram.mFeatures.calculatesLighting = true;
 		gAvatarEyeballProgram.mFeatures.isSpecular = true;
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index 31b87d08c9..d5a7a4d359 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -198,7 +198,6 @@ extern LLGLSLShader			gPathfindingNoNormalsProgram;
 extern LLGLSLShader			gAvatarProgram;
 extern LLGLSLShader			gAvatarWaterProgram;
 extern LLGLSLShader			gAvatarEyeballProgram;
-extern LLGLSLShader			gAvatarPickProgram;
 extern LLGLSLShader			gImpostorProgram;
 
 // Post Process Shaders