From 0fd3ff972d97886ce227424c6c7039e2cc203890 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Mon, 4 Jun 2012 12:15:08 -0700 Subject: MAINT-1142 use VBO pooling on OSX --- indra/llrender/llvertexbuffer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index b4899209c4..823c6b9dc5 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -38,7 +38,11 @@ #include "llglslshader.h" #include "llmemory.h" +#if LL_DARWIN +#define LL_VBO_POOLING 1 +#else #define LL_VBO_POOLING 0 +#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 -- cgit v1.2.3 From 332523b0d6a5d91676139eaee51ff98d1a7788ed Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 4 Jun 2012 21:08:40 -0400 Subject: tag merge of DRTVWR-160 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 256356cf6f..4dd032c154 100644 --- a/.hgtags +++ b/.hgtags @@ -305,3 +305,4 @@ c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate 6414ecdabc5d89515b08d1f872cf923ed3a5523a DRTVWR-148 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c DRTVWR-144 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c 3.3.3-beta1 +5910f8063a7e1ddddf504c2f35ca831cc5e8f469 DRTVWR-160 -- cgit v1.2.3 From fd3ae758d0dc3cb4330ea9c7a9af8c0ffa046dfc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 4 Jun 2012 21:11:54 -0400 Subject: Added tag 3.3.3-beta1, DRTVWR-144 for changeset f0a174c2adb4 --- .hgtags | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.hgtags b/.hgtags index 4dd032c154..9aad8eebbb 100644 --- a/.hgtags +++ b/.hgtags @@ -306,3 +306,7 @@ c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c DRTVWR-144 1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c 3.3.3-beta1 5910f8063a7e1ddddf504c2f35ca831cc5e8f469 DRTVWR-160 +1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c 3.3.3-beta1 +f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 3.3.3-beta1 +1b7f311b5a5dbfbed3dcbb4ed44afa20f89cad4c DRTVWR-144 +f0a174c2adb4bc39b16722a61d7eeb4f2a1d4843 DRTVWR-144 -- cgit v1.2.3