diff options
author | Don Kjer <don@lindenlab.com> | 2012-08-02 23:01:32 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-08-02 23:01:32 +0000 |
commit | 4f020596019d6c1058468374b5fb56767312c2ec (patch) | |
tree | 076654def501766cabda3ef8e944af6553e411a4 /indra/newview/pipeline.h | |
parent | 3a954ddda398bf0266bce303849495570c6bdae1 (diff) | |
parent | 5e8b525670456a6897127dd8029b5a740dc31c20 (diff) |
Merge viewer-horde-fixes -> sunshine
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index d1baf17d0d..6abdfe11d0 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -305,20 +305,28 @@ public: BOOL hasRenderDebugFeatureMask(const U32 mask) const { return (mRenderDebugFeatureMask & mask) ? TRUE : FALSE; } BOOL hasRenderDebugMask(const U32 mask) const { return (mRenderDebugMask & mask) ? TRUE : FALSE; } - - + void setAllRenderDebugFeatures() { mRenderDebugFeatureMask = 0xffffffff; } + void clearAllRenderDebugFeatures() { mRenderDebugFeatureMask = 0x0; } + void setAllRenderDebugDisplays() { mRenderDebugMask = 0xffffffff; } + void clearAllRenderDebugDisplays() { mRenderDebugMask = 0x0; } BOOL hasRenderType(const U32 type) const; BOOL hasAnyRenderType(const U32 type, ...) const; void setRenderTypeMask(U32 type, ...); - void orRenderTypeMask(U32 type, ...); + // This is equivalent to 'setRenderTypeMask' + //void orRenderTypeMask(U32 type, ...); void andRenderTypeMask(U32 type, ...); void clearRenderTypeMask(U32 type, ...); + void setAllRenderTypes(); + void clearAllRenderTypes(); void pushRenderTypeMask(); void popRenderTypeMask(); + void pushRenderDebugFeatureMask(); + void popRenderDebugFeatureMask(); + static void toggleRenderType(U32 type); // For UI control of render features @@ -614,6 +622,7 @@ protected: U32 mRenderDebugFeatureMask; U32 mRenderDebugMask; + std::stack<U32> mRenderDebugFeatureStack; U32 mOldRenderDebugMask; |