diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 12:08:43 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 12:08:43 -0700 |
| commit | fd6a82c9c3869c192c67adc5a6ea92361f86b880 (patch) | |
| tree | ed245df43dbd86382801f7a8472561e45b882f8d /indra/llrender/llvertexbuffer.cpp | |
| parent | 229762cd2775781018326d0d163f216972b91df7 (diff) | |
| parent | e7a5dc7cda09e65f8592793990c494a978a21271 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 80752231d7..eadef93c89 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -38,10 +38,6 @@ #include "llglslshader.h" #include "llmemory.h" -#if LL_DARWIN -#define LL_VBO_POOLING 1 -#else -#endif //Next Highest Power Of Two //helper function, returns first number > v that is a power of 2, or v if v is already a power of 2 U32 nhpo2(U32 v) @@ -294,6 +290,7 @@ void LLVBOPool::seedPool() } + void LLVBOPool::cleanup() { U32 size = LL_VBO_BLOCK_SIZE; |