diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
| commit | 9f393c1d99232e622317f7f0dd28519c2af63d0d (patch) | |
| tree | 842f1ab4c5d13bc1cd772ebf1356c8f7424596d9 /indra/newview/lldrawpool.h | |
| parent | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (diff) | |
| parent | a4966a661213a25b780604084fe169565f62f548 (diff) | |
merge up to latest snowstorm integration branch
Diffstat (limited to 'indra/newview/lldrawpool.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lldrawpool.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index ab9bb9e611..3bde0d29be 100644..100755 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -50,10 +50,13 @@ public: POOL_GROUND, POOL_FULLBRIGHT, POOL_BUMP, + POOL_MATERIALS, POOL_TERRAIN, POOL_SKY, POOL_WL_SKY, POOL_TREE, + POOL_ALPHA_MASK, + POOL_FULLBRIGHT_ALPHA_MASK, POOL_GRASS, POOL_INVISIBLE, // see below * POOL_AVATAR, @@ -133,6 +136,22 @@ public: PASS_SHINY, PASS_BUMP, PASS_POST_BUMP, + PASS_MATERIAL, + PASS_MATERIAL_ALPHA, + PASS_MATERIAL_ALPHA_MASK, + PASS_MATERIAL_ALPHA_EMISSIVE, + PASS_SPECMAP, + PASS_SPECMAP_BLEND, + PASS_SPECMAP_MASK, + PASS_SPECMAP_EMISSIVE, + PASS_NORMMAP, + PASS_NORMMAP_BLEND, + PASS_NORMMAP_MASK, + PASS_NORMMAP_EMISSIVE, + PASS_NORMSPEC, + PASS_NORMSPEC_BLEND, + PASS_NORMSPEC_MASK, + PASS_NORMSPEC_EMISSIVE, PASS_GLOW, PASS_ALPHA, PASS_ALPHA_MASK, @@ -151,6 +170,7 @@ public: static void applyModelMatrix(LLDrawInfo& params); virtual void pushBatches(U32 type, U32 mask, BOOL texture = TRUE, BOOL batch_textures = FALSE); + virtual void pushMaskBatches(U32 type, U32 mask, BOOL texture = TRUE, BOOL batch_textures = FALSE); virtual void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL batch_textures = FALSE); virtual void renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE); virtual void renderGroups(U32 type, U32 mask, BOOL texture = TRUE); |