From 9db49b4448abae1e171fd1b40d1a7049b6762353 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 11 Jul 2011 12:14:06 -0500
Subject: SH-2038 Disable usage of stream vbo on mac and make flexi's use
stream vbo if stream vbo disabled (effectively disables usage of vertex
buffers for flexible objects on mac)
---
indra/llrender/llvertexbuffer.cpp | 8 +-------
indra/newview/featuretable_mac.txt | 4 ++--
indra/newview/lldrawable.cpp | 5 +++++
3 files changed, 8 insertions(+), 9 deletions(-)
(limited to 'indra')
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 53ddca124b..b96023f613 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -978,17 +978,11 @@ BOOL LLVertexBuffer::useVBOs() const
{
//it's generally ineffective to use VBO for things that are streaming on apple
-#if LL_DARWIN
- if (!mUsage || mUsage == GL_STREAM_DRAW_ARB)
- {
- return FALSE;
- }
-#else
if (!mUsage)
{
return FALSE;
}
-#endif
+
return TRUE;
}
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 2f9f82fd9e..2784302f5a 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 27
+version 28
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table
@@ -64,7 +64,7 @@ RenderDeferred 1 1
RenderDeferredSSAO 1 1
RenderShadowDetail 1 2
WatchdogDisabled 1 1
-RenderUseStreamVBO 1 1
+RenderUseStreamVBO 1 0
RenderFSAASamples 1 16
//
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index ad3710843c..90fcb94088 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -1529,6 +1529,11 @@ BOOL LLDrawable::isAnimating() const
return TRUE;
}
+ if (!LLVertexBuffer::sUseStreamDraw && mVObjp->isFlexible())
+ {
+ return TRUE;
+ }
+
return FALSE;
}
--
cgit v1.2.3