diff options
Diffstat (limited to 'linden/indra/newview/llviewershadermgr.h')
-rw-r--r-- | linden/indra/newview/llviewershadermgr.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewershadermgr.h b/linden/indra/newview/llviewershadermgr.h index a743966..bb50779 100644 --- a/linden/indra/newview/llviewershadermgr.h +++ b/linden/indra/newview/llviewershadermgr.h | |||
@@ -116,12 +116,30 @@ public: | |||
116 | DEFERRED_SHADOW1, | 116 | DEFERRED_SHADOW1, |
117 | DEFERRED_SHADOW2, | 117 | DEFERRED_SHADOW2, |
118 | DEFERRED_SHADOW3, | 118 | DEFERRED_SHADOW3, |
119 | DEFERRED_SHADOW4, | ||
120 | DEFERRED_SHADOW5, | ||
119 | DEFERRED_NORMAL, | 121 | DEFERRED_NORMAL, |
120 | DEFERRED_POSITION, | 122 | DEFERRED_POSITION, |
121 | DEFERRED_DIFFUSE, | 123 | DEFERRED_DIFFUSE, |
122 | DEFERRED_SPECULAR, | 124 | DEFERRED_SPECULAR, |
123 | DEFERRED_NOISE, | 125 | DEFERRED_NOISE, |
126 | DEFERRED_LIGHTFUNC, | ||
124 | DEFERRED_LIGHT, | 127 | DEFERRED_LIGHT, |
128 | DEFERRED_LUMINANCE, | ||
129 | DEFERRED_GI_LIGHT, | ||
130 | DEFERRED_SUN_LIGHT, | ||
131 | DEFERRED_LOCAL_LIGHT, | ||
132 | DEFERRED_PROJECTION, | ||
133 | DEFERRED_GI_DIFFUSE, | ||
134 | DEFERRED_GI_SPECULAR, | ||
135 | DEFERRED_GI_NORMAL, | ||
136 | DEFERRED_GI_MIN_POS, | ||
137 | DEFERRED_GI_MAX_POS, | ||
138 | DEFERRED_GI_DEPTH, | ||
139 | DEFERRED_GI_LAST_DIFFUSE, | ||
140 | DEFERRED_GI_LAST_NORMAL, | ||
141 | DEFERRED_GI_LAST_MIN_POS, | ||
142 | DEFERRED_GI_LAST_MAX_POS, | ||
125 | END_RESERVED_UNIFORMS | 143 | END_RESERVED_UNIFORMS |
126 | } eGLSLReservedUniforms; | 144 | } eGLSLReservedUniforms; |
127 | 145 | ||
@@ -326,16 +344,23 @@ extern LLGLSLShader gDeferredTerrainProgram; | |||
326 | extern LLGLSLShader gDeferredTreeProgram; | 344 | extern LLGLSLShader gDeferredTreeProgram; |
327 | extern LLGLSLShader gDeferredLightProgram; | 345 | extern LLGLSLShader gDeferredLightProgram; |
328 | extern LLGLSLShader gDeferredMultiLightProgram; | 346 | extern LLGLSLShader gDeferredMultiLightProgram; |
347 | extern LLGLSLShader gDeferredSpotLightProgram; | ||
348 | extern LLGLSLShader gDeferredMultiSpotLightProgram; | ||
329 | extern LLGLSLShader gDeferredSunProgram; | 349 | extern LLGLSLShader gDeferredSunProgram; |
350 | extern LLGLSLShader gDeferredGIProgram; | ||
330 | extern LLGLSLShader gDeferredBlurLightProgram; | 351 | extern LLGLSLShader gDeferredBlurLightProgram; |
331 | extern LLGLSLShader gDeferredAvatarProgram; | 352 | extern LLGLSLShader gDeferredAvatarProgram; |
332 | extern LLGLSLShader gDeferredSoftenProgram; | 353 | extern LLGLSLShader gDeferredSoftenProgram; |
333 | extern LLGLSLShader gDeferredShadowProgram; | 354 | extern LLGLSLShader gDeferredShadowProgram; |
355 | extern LLGLSLShader gDeferredPostGIProgram; | ||
356 | extern LLGLSLShader gDeferredPostProgram; | ||
334 | extern LLGLSLShader gDeferredAvatarShadowProgram; | 357 | extern LLGLSLShader gDeferredAvatarShadowProgram; |
335 | extern LLGLSLShader gDeferredAlphaProgram; | 358 | extern LLGLSLShader gDeferredAlphaProgram; |
336 | extern LLGLSLShader gDeferredFullbrightProgram; | 359 | extern LLGLSLShader gDeferredFullbrightProgram; |
337 | extern LLGLSLShader gDeferredAvatarAlphaProgram; | 360 | extern LLGLSLShader gDeferredAvatarAlphaProgram; |
338 | 361 | ||
362 | extern LLGLSLShader gLuminanceGatherProgram; | ||
363 | |||
339 | //current avatar shader parameter pointer | 364 | //current avatar shader parameter pointer |
340 | extern GLint gAvatarMatrixParam; | 365 | extern GLint gAvatarMatrixParam; |
341 | 366 | ||