diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-27 22:01:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-27 22:01:56 -0500 |
| commit | 74b5bfb98f0496a8e1519c4732bb5942e6fcc78a (patch) | |
| tree | 8963d2db094d4fb349a31364b907087a48b4bddf /indra/newview/llviewershadermgr.h | |
| parent | f0c2f99c25a4d73dac75203db881aaebaeeb25f6 (diff) | |
| parent | 4f8827d2a8fc37f88d271be20f8fa03b14ec5732 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 15bff6882e..f0bf352e75 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -28,6 +28,7 @@ #define LL_VIEWER_SHADER_MGR_H #include "llshadermgr.h" +#include "llmaterial.h" class LLViewerShaderMgr: public LLShaderMgr { @@ -363,14 +364,6 @@ extern LLGLSLShader gDeferredStarProgram; extern LLGLSLShader gNormalMapGenProgram; // Deferred materials shaders -extern LLGLSLShader gDeferredMaterialShiny; -extern LLGLSLShader gDeferredMaterialNormal; -extern LLGLSLShader gDeferredMaterialShinyNormal; -extern LLGLSLShader gDeferredMaterialShinyAlphaTest; -extern LLGLSLShader gDeferredMaterialNormalAlphaTest; -extern LLGLSLShader gDeferredMaterialShinyNormalAlphaTest; -extern LLGLSLShader gDeferredMaterialShinyEmissive; -extern LLGLSLShader gDeferredMaterialNormalEmissive; -extern LLGLSLShader gDeferredMaterialShinyNormalEmissive; +extern LLGLSLShader gDeferredMaterialProgram[LLMaterial::SHADER_COUNT]; #endif |