diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-17 14:32:29 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-17 14:32:29 -0700 |
| commit | 9da9b2d84be4c9bb2f0f8208ada6f67e8a53a7e8 (patch) | |
| tree | b9f0da0557b8ec0e5a1d7599caa0389795457068 /indra/llrender | |
| parent | 2f8e4f240881fe990699872eafb6d7dceb5e5a9f (diff) | |
| parent | a7f6dcaef7fb49901a2ebf0629e3089fa8cdad98 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/llrender')
| -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; |