diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/lldrawpoolalpha.h | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/lldrawpoolalpha.h')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h index 0e39003551..637ea25f80 100644 --- a/indra/newview/lldrawpoolalpha.h +++ b/indra/newview/lldrawpoolalpha.h @@ -37,6 +37,7 @@ class LLFace; class LLColor4; +class LLGLSLShader; class LLDrawPoolAlpha: public LLRenderPass { @@ -54,15 +55,26 @@ public: /*virtual*/ ~LLDrawPoolAlpha(); /*virtual*/ void beginRenderPass(S32 pass = 0); + /*virtual*/ void endRenderPass( S32 pass ); + /*virtual*/ S32 getNumPasses() { return 1; } + virtual void render(S32 pass = 0); - void render(std::vector<LLSpatialGroup*>& groups); /*virtual*/ void prerender(); void renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE); - void renderAlpha(U32 mask, std::vector<LLSpatialGroup*>& groups); - void renderAlphaHighlight(U32 mask, std::vector<LLSpatialGroup*>& groups); + void renderAlpha(U32 mask); + void renderAlphaHighlight(U32 mask); static BOOL sShowDebugAlpha; + +private: + S32 mDiffuse; + LLGLSLShader* current_shader; + LLGLSLShader* target_shader; + LLGLSLShader* simple_shader; + LLGLSLShader* simple_lod_shader; + LLGLSLShader* fullbright_shader; + LLGLSLShader* fullbright_lod_shader; }; class LLDrawPoolAlphaPostWater : public LLDrawPoolAlpha |