diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:28:40 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:28:40 -0700 |
| commit | 3dc61c4b4afed47826070aa906e58c8c5ca3efa0 (patch) | |
| tree | 078d2f9d44e5d6f0fc0f47cee388377eb8c0e0ed /indra/llrender/llvertexbuffer.cpp | |
| parent | 05a72687d848c13754039f6e720a137827533fdb (diff) | |
| parent | c320b4878ae9cd166594285a88437f0d5c333353 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 28a14b23b9..ed48c49900 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -38,6 +38,10 @@ #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) @@ -291,7 +295,6 @@ void LLVBOPool::seedPool() - void LLVBOPool::cleanup() { U32 size = LL_VBO_BLOCK_SIZE; |