diff options
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index d37e86fa5e..829e7f8add 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -3664,20 +3664,10 @@ BOOL LLViewerShaderMgr::loadShadersInterface() gDebugProgram.mShaderFiles.push_back(make_pair("interface/debugF.glsl", GL_FRAGMENT_SHADER_ARB)); gDebugProgram.mRiggedVariant = &gSkinnedDebugProgram; gDebugProgram.mShaderLevel = mShaderLevel[SHADER_INTERFACE]; - success = gDebugProgram.createShader(NULL, NULL); + success = make_rigged_variant(gDebugProgram, gSkinnedDebugProgram); + success = success && gDebugProgram.createShader(NULL, NULL); } - if (success) - { - gSkinnedDebugProgram.mName = "Skinned Debug Shader"; - gSkinnedDebugProgram.mFeatures.hasObjectSkinning = true; - gSkinnedDebugProgram.mShaderFiles.clear(); - gSkinnedDebugProgram.mShaderFiles.push_back(make_pair("interface/debugSkinnedV.glsl", GL_VERTEX_SHADER_ARB)); - gSkinnedDebugProgram.mShaderFiles.push_back(make_pair("interface/debugF.glsl", GL_FRAGMENT_SHADER_ARB)); - gSkinnedDebugProgram.mShaderLevel = mShaderLevel[SHADER_INTERFACE]; - success = gSkinnedDebugProgram.createShader(NULL, NULL); - } - if (success) { gClipProgram.mName = "Clip Shader"; |