diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/newview/lldrawpool.h | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/newview/lldrawpool.h')
| -rw-r--r-- | indra/newview/lldrawpool.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index 45a47f4c3f..b75de02ffc 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -58,10 +58,12 @@ public: POOL_SKY, POOL_WL_SKY, POOL_GROUND, - POOL_BUMP, POOL_INVISIBLE, POOL_AVATAR, POOL_WATER, + POOL_GRASS, + POOL_FULLBRIGHT, + POOL_BUMP, POOL_GLOW, POOL_ALPHA, NUM_POOL_TYPES, @@ -78,7 +80,23 @@ public: virtual LLViewerImage *getDebugTexture(); virtual void beginRenderPass( S32 pass ); virtual void endRenderPass( S32 pass ); - virtual S32 getNumPasses() { return 1; } + virtual S32 getNumPasses(); + + virtual void beginDeferredPass(S32 pass); + virtual void endDeferredPass(S32 pass); + virtual S32 getNumDeferredPasses(); + virtual void renderDeferred(S32 pass = 0); + + virtual void beginPostDeferredPass(S32 pass); + virtual void endPostDeferredPass(S32 pass); + virtual S32 getNumPostDeferredPasses(); + virtual void renderPostDeferred(S32 pass = 0); + + virtual void beginShadowPass(S32 pass); + virtual void endShadowPass(S32 pass); + virtual S32 getNumShadowPasses(); + virtual void renderShadow(S32 pass = 0); + virtual void render(S32 pass = 0) = 0; virtual void prerender() = 0; virtual U32 getVertexDataMask() = 0; @@ -112,6 +130,9 @@ public: PASS_BUMP, PASS_GLOW, PASS_ALPHA, + PASS_ALPHA_MASK, + PASS_FULLBRIGHT_ALPHA_MASK, + PASS_ALPHA_SHADOW, NUM_RENDER_TYPES, }; |