summaryrefslogtreecommitdiff
path: root/indra/llrender/llvertexbuffer.h
diff options
context:
space:
mode:
authorJJ Linden <jj@lindenlab.com>2013-10-21 14:36:34 -0700
committerJJ Linden <jj@lindenlab.com>2013-10-21 14:36:34 -0700
commit9c6bd3b395027746317654a137270870036e73f1 (patch)
treebd0a932adb41cac09fdb03043ea446bae3378436 /indra/llrender/llvertexbuffer.h
parentdc431ea6d2e4e13ab505b8118d6f9220630efe96 (diff)
parentc7057c141c38492bfdc2bfe9d82de97a7364f01b (diff)
merged in recent changes
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
-rwxr-xr-xindra/llrender/llvertexbuffer.h4
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;