diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
| commit | 0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch) | |
| tree | 2c93f9a8d69f28cec99393b3cacbab85a8aa073d /indra/llrender/llvertexbuffer.cpp | |
| parent | 6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff) | |
| parent | 7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index ed48c49900..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) |