diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-02 17:55:04 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-02 17:55:04 -0500 |
| commit | 6e184e33018a5395bfbb2c92812229d115944ab5 (patch) | |
| tree | 527acec5c80dc56c607c5414b7bce0c2b496a891 /indra/newview/llviewershadermgr.cpp | |
| parent | f90bcb3a55a0e61f3dbf068c3ddea86b6d5f519f (diff) | |
Cleaner render of walkables and materials. Convert Vector3 color parameters to Color4.
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 6db2138688..0948e261ce 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -134,6 +134,7 @@ LLGLSLShader gUnderWaterProgram; //interface shaders LLGLSLShader gHighlightProgram; +LLGLSLShader gPathfindingProgram; //avatar shader handles LLGLSLShader gAvatarProgram; @@ -594,6 +595,7 @@ void LLViewerShaderMgr::unloadShaders() gDebugProgram.unload(); gAlphaMaskProgram.unload(); gUIProgram.unload(); + gPathfindingProgram.unload(); gCustomAlphaProgram.unload(); gGlowCombineProgram.unload(); gSplatTextureRectProgram.unload(); @@ -2512,6 +2514,16 @@ BOOL LLViewerShaderMgr::loadShadersInterface() if (success) { + gPathfindingProgram.mName = "Pathfinding Shader"; + gPathfindingProgram.mShaderFiles.clear(); + gPathfindingProgram.mShaderFiles.push_back(make_pair("interface/pathfindingV.glsl", GL_VERTEX_SHADER_ARB)); + gPathfindingProgram.mShaderFiles.push_back(make_pair("interface/pathfindingF.glsl", GL_FRAGMENT_SHADER_ARB)); + gPathfindingProgram.mShaderLevel = mVertexShaderLevel[SHADER_INTERFACE]; + success = gPathfindingProgram.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)); |