summaryrefslogtreecommitdiff
path: root/indra/llrender/llvertexbuffer.cpp
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-18 22:29:02 +0300
committerMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-18 22:29:02 +0300
commitc43cfcdcbd243410e2f780f58f93100e96fc996c (patch)
treed5daa0187843a9302c1011937d452d40692d0d1a /indra/llrender/llvertexbuffer.cpp
parentc0b60841ce14a1c449ede17284d2aa6939322be3 (diff)
parentf9c068462f379a4678e59090a066cfa173504c6b (diff)
merge into latest changes
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
-rw-r--r--indra/llrender/llvertexbuffer.cpp5
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;