diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-24 10:51:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 10:51:37 -0400 |
| commit | 8df36196215131cbac961f47bfbd4a1b925548cb (patch) | |
| tree | 35fe890f1f2e47c9acd0d411925897ee7e3794d6 /indra/llrender/llvertexbuffer.cpp | |
| parent | 4feef5af63f6294249aa50e37fba712cd9ddec91 (diff) | |
| parent | d7015a2b9b55907c8447d0051cf5d7ac862aebf7 (diff) | |
merge to viewer-developmento
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; |