diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/pipeline.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h index a85877d..7c56375 100644 --- a/linden/indra/newview/pipeline.h +++ b/linden/indra/newview/pipeline.h | |||
@@ -318,20 +318,21 @@ public: | |||
318 | enum LLRenderTypeMask | 318 | enum LLRenderTypeMask |
319 | { | 319 | { |
320 | // Following are pool types (some are also object types) | 320 | // Following are pool types (some are also object types) |
321 | RENDER_TYPE_SKY = LLDrawPool::POOL_SKY, | 321 | RENDER_TYPE_SKY = LLDrawPool::POOL_SKY, |
322 | RENDER_TYPE_WL_SKY = LLDrawPool::POOL_WL_SKY, | 322 | RENDER_TYPE_WL_SKY = LLDrawPool::POOL_WL_SKY, |
323 | RENDER_TYPE_GROUND = LLDrawPool::POOL_GROUND, | 323 | RENDER_TYPE_GROUND = LLDrawPool::POOL_GROUND, |
324 | RENDER_TYPE_TERRAIN = LLDrawPool::POOL_TERRAIN, | 324 | RENDER_TYPE_TERRAIN = LLDrawPool::POOL_TERRAIN, |
325 | RENDER_TYPE_SIMPLE = LLDrawPool::POOL_SIMPLE, | 325 | RENDER_TYPE_SIMPLE = LLDrawPool::POOL_SIMPLE, |
326 | RENDER_TYPE_GRASS = LLDrawPool::POOL_GRASS, | 326 | RENDER_TYPE_GRASS = LLDrawPool::POOL_GRASS, |
327 | RENDER_TYPE_FULLBRIGHT = LLDrawPool::POOL_FULLBRIGHT, | 327 | RENDER_TYPE_FULLBRIGHT = LLDrawPool::POOL_FULLBRIGHT, |
328 | RENDER_TYPE_BUMP = LLDrawPool::POOL_BUMP, | 328 | RENDER_TYPE_BUMP = LLDrawPool::POOL_BUMP, |
329 | RENDER_TYPE_AVATAR = LLDrawPool::POOL_AVATAR, | 329 | RENDER_TYPE_AVATAR = LLDrawPool::POOL_AVATAR, |
330 | RENDER_TYPE_TREE = LLDrawPool::POOL_TREE, | 330 | RENDER_TYPE_TREE = LLDrawPool::POOL_TREE, |
331 | RENDER_TYPE_INVISIBLE = LLDrawPool::POOL_INVISIBLE, | 331 | RENDER_TYPE_INVISIBLE = LLDrawPool::POOL_INVISIBLE, |
332 | RENDER_TYPE_WATER = LLDrawPool::POOL_WATER, | 332 | RENDER_TYPE_VOIDWATER = LLDrawPool::POOL_VOIDWATER, |
333 | RENDER_TYPE_ALPHA = LLDrawPool::POOL_ALPHA, | 333 | RENDER_TYPE_WATER = LLDrawPool::POOL_WATER, |
334 | RENDER_TYPE_GLOW = LLDrawPool::POOL_GLOW, | 334 | RENDER_TYPE_ALPHA = LLDrawPool::POOL_ALPHA, |
335 | RENDER_TYPE_GLOW = LLDrawPool::POOL_GLOW, | ||
335 | RENDER_TYPE_PASS_SIMPLE = LLRenderPass::PASS_SIMPLE, | 336 | RENDER_TYPE_PASS_SIMPLE = LLRenderPass::PASS_SIMPLE, |
336 | RENDER_TYPE_PASS_GRASS = LLRenderPass::PASS_GRASS, | 337 | RENDER_TYPE_PASS_GRASS = LLRenderPass::PASS_GRASS, |
337 | RENDER_TYPE_PASS_FULLBRIGHT = LLRenderPass::PASS_FULLBRIGHT, | 338 | RENDER_TYPE_PASS_FULLBRIGHT = LLRenderPass::PASS_FULLBRIGHT, |
@@ -346,7 +347,7 @@ public: | |||
346 | RENDER_TYPE_PASS_FULLBRIGHT_ALPHA_MASK = LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, | 347 | RENDER_TYPE_PASS_FULLBRIGHT_ALPHA_MASK = LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, |
347 | RENDER_TYPE_PASS_ALPHA_SHADOW = LLRenderPass::PASS_ALPHA_SHADOW, | 348 | RENDER_TYPE_PASS_ALPHA_SHADOW = LLRenderPass::PASS_ALPHA_SHADOW, |
348 | // Following are object types (only used in drawable mRenderType) | 349 | // Following are object types (only used in drawable mRenderType) |
349 | RENDER_TYPE_HUD = LLRenderPass::NUM_RENDER_TYPES, | 350 | RENDER_TYPE_HUD = LLDrawPool::NUM_POOL_TYPES, |
350 | RENDER_TYPE_VOLUME, | 351 | RENDER_TYPE_VOLUME, |
351 | RENDER_TYPE_PARTICLES, | 352 | RENDER_TYPE_PARTICLES, |
352 | RENDER_TYPE_CLOUDS, | 353 | RENDER_TYPE_CLOUDS, |