diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-27 16:16:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-27 16:16:56 -0500 |
| commit | 380785e613b9823cb6160be5678e5f01783fee5f (patch) | |
| tree | dce0f35d02994c861428683b91f64371e9a64ea0 /indra/llrender/llvertexbuffer.h | |
| parent | 21b78d7368f969fdf0daf7994fb565da633b1e71 (diff) | |
| parent | 4696eeeb30ce4d01c3bcbe74c9024f05d848968a (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
| -rwxr-xr-x | 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 04806c1d8c..b7597cf60e 100755 --- 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; |