diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/newview/lldrawpoolterrain.h | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/newview/lldrawpoolterrain.h')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolterrain.h b/indra/newview/lldrawpoolterrain.h index b5fe0a30fd..4882532e8a 100644 --- a/indra/newview/lldrawpoolterrain.h +++ b/indra/newview/lldrawpoolterrain.h @@ -11,10 +11,22 @@ #include "lldrawpool.h" -class LLDrawPoolTerrain : public LLDrawPool +class LLDrawPoolTerrain : public LLFacePool { LLPointer<LLViewerImage> mTexturep; public: + enum + { + VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | + LLVertexBuffer::MAP_NORMAL | + LLVertexBuffer::MAP_TEXCOORD | + LLVertexBuffer::MAP_TEXCOORD2 | + LLVertexBuffer::MAP_COLOR + }; + + virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } + static S32 getDetailMode(); + LLDrawPoolTerrain(LLViewerImage *texturep); virtual ~LLDrawPoolTerrain(); @@ -24,7 +36,7 @@ public: /*virtual*/ void render(S32 pass = 0); /*virtual*/ void prerender(); /*virtual*/ void renderForSelect(); - /*virtual*/ void dirtyTexture(const LLViewerImage *texturep); + /*virtual*/ void dirtyTextures(const std::set<LLViewerImage*>& textures); /*virtual*/ LLViewerImage *getTexture(); /*virtual*/ LLViewerImage *getDebugTexture(); /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display |