diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-10-04 15:36:52 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-10-04 15:36:52 -0400 |
| commit | 6f5790da38b3005292d3dbeaad778ea740110e33 (patch) | |
| tree | b28ce7a7a158f72f4dbfda60bafff2317c671837 /indra/llrender/llvertexbuffer.h | |
| parent | 56e2f11417183d8dcc3d681f79fc63446b236abb (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Merge. Pull in viewer-release after 3.6.7 release.
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
| -rwxr-xr-x | indra/llrender/llvertexbuffer.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index 04806c1d8c..de58207c23 100755 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -107,6 +107,7 @@ public: S32 mType; S32 mIndex; S32 mCount; + S32 mEnd; MappedRegion(S32 type, S32 index, S32 count); }; @@ -125,9 +126,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; |