diff options
author | Dave Parks <davep@lindenlab.com> | 2023-02-03 20:01:21 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2023-02-03 20:01:21 -0600 |
commit | 9b9f8116c5e10de4ee7187a5ee08fd057192c602 (patch) | |
tree | 5e12b2bd743aa799e96c94bda0e81f2383919e2b /indra/newview/llviewershadermgr.cpp | |
parent | 4ea51c6ce4b29c0b3875e32f0daf86390cec8950 (diff) |
SL-19148 Decruft followthrough -- one more dead shader
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
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; |