diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-01 10:12:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-01 10:12:33 -0400 |
| commit | cdedd9356abd47b13f958f4c4a90d6c09c30d21e (patch) | |
| tree | 30a29109f15c05358ef552c0c46a89591db4546a /indra/newview/llviewershadermgr.h | |
| parent | 743b6ca6177f46d7d7f964993ee226ef6706d408 (diff) | |
| parent | 21b78d7368f969fdf0daf7994fb565da633b1e71 (diff) | |
merge changes for latest project integration repo
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rwxr-xr-x | indra/newview/llviewershadermgr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 438853cd6f..ed8167947d 100755 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -30,6 +30,8 @@ #include "llshadermgr.h" #include "llmaterial.h" +#define LL_DEFERRED_MULTI_LIGHT_COUNT 16 + class LLViewerShaderMgr: public LLShaderMgr { public: @@ -341,7 +343,7 @@ extern LLGLSLShader gDeferredTerrainProgram; extern LLGLSLShader gDeferredTreeProgram; extern LLGLSLShader gDeferredTreeShadowProgram; extern LLGLSLShader gDeferredLightProgram; -extern LLGLSLShader gDeferredMultiLightProgram; +extern LLGLSLShader gDeferredMultiLightProgram[LL_DEFERRED_MULTI_LIGHT_COUNT]; extern LLGLSLShader gDeferredSpotLightProgram; extern LLGLSLShader gDeferredMultiSpotLightProgram; extern LLGLSLShader gDeferredSunProgram; |