diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
| commit | 98a89748789034a53f129e19d06649d79b384c52 (patch) | |
| tree | 39a1aefb35402db02c8791bc3e5735c36116f426 /indra/llrender/llvertexbuffer.h | |
| parent | 796be733b374beb5660ee2713fc28c4e69331cbd (diff) | |
| parent | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff) | |
Pull merge from viewer-fbc
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; |