diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
| commit | 0d568ce9f0522eaa21a12fa5fae31f80c59bd947 (patch) | |
| tree | 6b849a3b48a35feaeff0278ca8e562359df852e2 /indra/newview/lldrawpoolsimple.h | |
| parent | 28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff) | |
| parent | ef8bdb5d95ebd869279ee4bb0510d54e51ab747f (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); |