diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
| commit | 046014aa10e535bfa18e3d7b4c2da70284a615ae (patch) | |
| tree | a2ddc78c2da49f22ae6c11195b0fbc5c27e32e5b /indra/llrender/llvertexbuffer.h | |
| parent | b19eeabd54afcfb56e864899c166b64db1ac6790 (diff) | |
| parent | a65c275865f1cc9bf53237e4b8c99a7bee3731ee (diff) | |
Merged lindenlab/viewer-cat into default
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
| -rw-r--r-- | indra/llrender/llvertexbuffer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index 11fa4ab6a0..52559d3505 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -104,11 +104,11 @@ public: class MappedRegion { public: - S32 mType; S32 mIndex; S32 mCount; + S32 mEnd; - MappedRegion(S32 type, S32 index, S32 count); + MappedRegion(S32 index, S32 count); }; LLVertexBuffer(const LLVertexBuffer& rhs) @@ -125,9 +125,10 @@ public: static LLVBOPool sStreamVBOPool; static LLVBOPool sDynamicVBOPool; + static LLVBOPool sDynamicCopyVBOPool; static LLVBOPool sStreamIBOPool; static LLVBOPool sDynamicIBOPool; - + static std::list<U32> sAvailableVAOName; static U32 sCurVAOName; |