diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
| commit | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (patch) | |
| tree | b6fc95044fc41cdc43969195f9c1939e8ecb0158 /indra/newview/lldrawpoolalpha.h | |
| parent | dd2ede9991a9a31821fbe43a7fa17a5aafa19542 (diff) | |
| parent | 7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff) | |
merge changes for 3.6.0-materials-beta1
Diffstat (limited to 'indra/newview/lldrawpoolalpha.h')
| -rwxr-xr-x | indra/newview/lldrawpoolalpha.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/lldrawpoolalpha.h b/indra/newview/lldrawpoolalpha.h index 46c17f3b99..43122218ed 100755 --- a/indra/newview/lldrawpoolalpha.h +++ b/indra/newview/lldrawpoolalpha.h @@ -50,11 +50,6 @@ public: LLDrawPoolAlpha(U32 type = LLDrawPool::POOL_ALPHA); /*virtual*/ ~LLDrawPoolAlpha(); - /*virtual*/ S32 getNumDeferredPasses(); - /*virtual*/ void beginDeferredPass(S32 pass); - /*virtual*/ void endDeferredPass(S32 pass); - /*virtual*/ void renderDeferred(S32 pass); - /*virtual*/ S32 getNumPostDeferredPasses(); /*virtual*/ void beginPostDeferredPass(S32 pass); /*virtual*/ void endPostDeferredPass(S32 pass); @@ -70,9 +65,7 @@ public: void renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE); void renderAlpha(U32 mask); void renderAlphaHighlight(U32 mask); - void pushMaskBatches(U32 type, U32 mask, BOOL texture, BOOL batch_textures); - - + static BOOL sShowDebugAlpha; private: |