diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-04 14:16:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-04 14:16:17 -0500 |
| commit | d21dd289b0543d1043424067de230561e531999c (patch) | |
| tree | f24c59959a6c3bc155902360fcb9e0eb2e042d70 /indra/newview/llviewershadermgr.cpp | |
| parent | 499a43df65a49fd667fb666015b8900a4fd6aa6b (diff) | |
Cleanup edge render and resolve assertions from lack of normals in edges.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 0948e261ce..65b6634c57 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -135,6 +135,7 @@ LLGLSLShader gUnderWaterProgram; //interface shaders LLGLSLShader gHighlightProgram; LLGLSLShader gPathfindingProgram; +LLGLSLShader gPathfindingNoNormalsProgram; //avatar shader handles LLGLSLShader gAvatarProgram; @@ -596,6 +597,7 @@ void LLViewerShaderMgr::unloadShaders() gAlphaMaskProgram.unload(); gUIProgram.unload(); gPathfindingProgram.unload(); + gPathfindingNoNormalsProgram.unload(); gCustomAlphaProgram.unload(); gGlowCombineProgram.unload(); gSplatTextureRectProgram.unload(); @@ -2524,6 +2526,16 @@ BOOL LLViewerShaderMgr::loadShadersInterface() if (success) { + gPathfindingNoNormalsProgram.mName = "PathfindingNoNormals Shader"; + gPathfindingNoNormalsProgram.mShaderFiles.clear(); + gPathfindingNoNormalsProgram.mShaderFiles.push_back(make_pair("interface/pathfindingNoNormalV.glsl", GL_VERTEX_SHADER_ARB)); + gPathfindingNoNormalsProgram.mShaderFiles.push_back(make_pair("interface/pathfindingF.glsl", GL_FRAGMENT_SHADER_ARB)); + gPathfindingNoNormalsProgram.mShaderLevel = mVertexShaderLevel[SHADER_INTERFACE]; + success = gPathfindingNoNormalsProgram.createShader(NULL, NULL); + } + + if (success) + { gCustomAlphaProgram.mName = "Custom Alpha Shader"; gCustomAlphaProgram.mShaderFiles.clear(); gCustomAlphaProgram.mShaderFiles.push_back(make_pair("interface/customalphaV.glsl", GL_VERTEX_SHADER_ARB)); |