diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:55:11 -0500 |
| commit | f72a24bf3a5bf7ecb826ef5e6d7f17dbb92d5db2 (patch) | |
| tree | a4a070ba8b95645089dcd55a848baec41b625cbc /indra/newview/lldrawpoolsimple.h | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | 530981a2149a74e1dc003cea1bbc9dc392fcae60 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolsimple.h')
| -rw-r--r-- | indra/newview/lldrawpoolsimple.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolsimple.h b/indra/newview/lldrawpoolsimple.h index 3811b3d398..bd62bc7502 100644 --- a/indra/newview/lldrawpoolsimple.h +++ b/indra/newview/lldrawpoolsimple.h @@ -118,7 +118,8 @@ public: enum { VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | - LLVertexBuffer::MAP_TEXCOORD0 + LLVertexBuffer::MAP_TEXCOORD0 | + LLVertexBuffer::MAP_EMISSIVE }; virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } @@ -130,6 +131,8 @@ public: /*virtual*/ void endPostDeferredPass(S32 pass); /*virtual*/ void renderPostDeferred(S32 pass); + /*virtual*/ S32 getNumPasses(); + void render(S32 pass = 0); void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture = TRUE, BOOL batch_textures = FALSE); |