summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-12-03 22:16:16 -0700
committerXiaohong Bao <bao@lindenlab.com>2010-12-03 22:16:16 -0700
commitf4ff1430f0d6ae7dd5a6be0bd665678b30a63aca (patch)
tree868824676d294f2b47dd33a4cfdc21b6459f977c /indra/newview/pipeline.h
parent219cd6ecda60e1c48852f582f0994573fd0e10ae (diff)
first iteration of memory pool code
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r--indra/newview/pipeline.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index b80765dac6..f4a7dfd38d 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -334,6 +334,8 @@ public:
static void updateRenderDeferred();
+ static void throttleNewMemoryAllocation(BOOL disable);
+
private:
void unloadShaders();
void addToQuickLookup( LLDrawPool* new_poolp );
@@ -477,8 +479,9 @@ public:
static BOOL sRenderAttachedParticles;
static BOOL sRenderDeferred;
static BOOL sAllowRebuildPriorityGroup;
+ static BOOL sMemAllocationThrottled;
static S32 sVisibleLightCount;
- static F32 sMinRenderSize;
+ static F32 sMinRenderSize;
//screen texture
U32 mScreenWidth;