diff options
author | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
commit | af142618f9c18a418bd11ab8eae6c83caa03ddac (patch) | |
tree | fbdfb3f954bf68df568c1dc898b0dc261ad77873 /indra/newview/lldrawpoolwlsky.h | |
parent | ae2cbe5258ad76e22420be2760379480e10fb72c (diff) | |
parent | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/lldrawpoolwlsky.h')
-rw-r--r-- | indra/newview/lldrawpoolwlsky.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lldrawpoolwlsky.h b/indra/newview/lldrawpoolwlsky.h index 8ca1ebb942..cd15c991ee 100644 --- a/indra/newview/lldrawpoolwlsky.h +++ b/indra/newview/lldrawpoolwlsky.h @@ -44,10 +44,10 @@ public: /*virtual*/ BOOL isDead() { return FALSE; } - /*virtual*/ S32 getNumPostDeferredPasses() { return getNumPasses(); } - /*virtual*/ void beginPostDeferredPass(S32 pass) { beginRenderPass(pass); } - /*virtual*/ void endPostDeferredPass(S32 pass) { endRenderPass(pass); } - /*virtual*/ void renderPostDeferred(S32 pass) { render(pass); } + /*virtual*/ S32 getNumDeferredPasses() { return 1; } + /*virtual*/ void beginDeferredPass(S32 pass); + /*virtual*/ void endDeferredPass(S32 pass); + /*virtual*/ void renderDeferred(S32 pass); /*virtual*/ LLViewerTexture *getDebugTexture(); /*virtual*/ void beginRenderPass( S32 pass ); |