diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
| commit | ac1d3a22f2034a5e3aba757bde72825643fa799c (patch) | |
| tree | 420b1e27469931f3017bcbe2e7c6f12f2dbd644b /indra/llrender/llvertexbuffer.h | |
| parent | 6d405e2d018e6722288e1cfbf477d985b8384a54 (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
| -rwxr-xr-x | indra/llrender/llvertexbuffer.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index de58207c23..619a0cec46 100755 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -57,8 +57,6 @@ public: static U32 sBytesPooled; static U32 sIndexBytesPooled; - static U32 sCurGLName; - LLVBOPool(U32 vboUsage, U32 vboType); const U32 mUsage; @@ -86,8 +84,6 @@ public: volatile U8* mClientData; }; - std::list<U32> mGLNamePool; - typedef std::list<Record> record_list_t; std::vector<record_list_t> mFreeList; std::vector<U32> mMissCount; |