diff options
author | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
commit | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (patch) | |
tree | c32d7e9b29e37d5c30ac16dfac55733456d7eee0 /indra/newview/pipeline.h | |
parent | 27cf39cdbf27fe52dcf9c70cfdadcc18ddf2e75c (diff) | |
parent | a8d216e194327c7bee8a42c983f7f2ca01adb385 (diff) |
Merge of my DEV-36732 work and all the main line login api work that went on.
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 5358fce766..fc02e7dd88 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -46,7 +46,7 @@ #include "lldrawable.h" #include "llrendertarget.h" -class LLViewerImage; +class LLViewerTexture; class LLEdge; class LLFace; class LLViewerObject; @@ -104,15 +104,15 @@ public: /// @brief Get a draw pool from pool type (POOL_SIMPLE, POOL_MEDIA) and texture. /// @return Draw pool, or NULL if not found. - LLDrawPool *findPool(const U32 pool_type, LLViewerImage *tex0 = NULL); + LLDrawPool *findPool(const U32 pool_type, LLViewerTexture *tex0 = NULL); /// @brief Get a draw pool for faces of the appropriate type and texture. Create if necessary. /// @return Always returns a draw pool. - LLDrawPool *getPool(const U32 pool_type, LLViewerImage *tex0 = NULL); + LLDrawPool *getPool(const U32 pool_type, LLViewerTexture *tex0 = NULL); /// @brief Figures out draw pool type from texture entry. Creates pool if necessary. - static LLDrawPool* getPoolFromTE(const LLTextureEntry* te, LLViewerImage* te_image); - static U32 getPoolTypeFromTE(const LLTextureEntry* te, LLViewerImage* imagep); + static LLDrawPool* getPoolFromTE(const LLTextureEntry* te, LLViewerTexture* te_image); + static U32 getPoolTypeFromTE(const LLTextureEntry* te, LLViewerTexture* imagep); void addPool(LLDrawPool *poolp); // Only to be used by LLDrawPool classes for splitting pools! void removePool( LLDrawPool* poolp ); @@ -150,7 +150,7 @@ public: ); // Something about these textures has changed. Dirty them. - void dirtyPoolObjectTextures(const std::set<LLViewerImage*>& textures); + void dirtyPoolObjectTextures(const std::set<LLViewerFetchedTexture*>& textures); void resetDrawOrders(); @@ -561,9 +561,9 @@ public: protected: std::vector<LLFace*> mSelectedFaces; - LLPointer<LLViewerImage> mFaceSelectImagep; - LLPointer<LLViewerImage> mBloomImagep; - LLPointer<LLViewerImage> mBloomImage2p; + LLPointer<LLViewerFetchedTexture> mFaceSelectImagep; + LLPointer<LLViewerTexture> mBloomImagep; + LLPointer<LLViewerTexture> mBloomImage2p; U32 mLightMask; U32 mLightMovingMask; |