summaryrefslogtreecommitdiff
path: root/indra/llrender/lltexture.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llrender/lltexture.h')
-rwxr-xr-x[-rw-r--r--]indra/llrender/lltexture.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/llrender/lltexture.h b/indra/llrender/lltexture.h
index 569a65c2e0..9fca8b8cd3 100644..100755
--- a/indra/llrender/lltexture.h
+++ b/indra/llrender/lltexture.h
@@ -33,15 +33,16 @@
#define LL_TEXTURE_H
#include "llrefcount.h"
+#include "lltrace.h"
+
class LLImageGL ;
class LLTexUnit ;
class LLFontGL ;
//
-//this is an abstract class as the parent for the class LLViewerTexture
-//through the following virtual functions, the class LLViewerTexture can be reached from /llrender.
+//this is an abstract class as the parent for the class LLGLTexture
//
-class LLTexture : public LLRefCount
+class LLTexture : public virtual LLRefCount, public LLTrace::MemTrackable<LLTexture>
{
friend class LLTexUnit ;
friend class LLFontGL ;
@@ -50,18 +51,22 @@ protected:
virtual ~LLTexture();
public:
- LLTexture(){}
+ LLTexture()
+ : LLTrace::MemTrackable<LLTexture>("LLTexture")
+ {}
//
- //interfaces to access LLViewerTexture
+ //interfaces to access LLGLTexture
//
virtual S8 getType() const = 0 ;
virtual void setKnownDrawSize(S32 width, S32 height) = 0 ;
virtual bool bindDefaultImage(const S32 stage = 0) = 0 ;
+ virtual bool bindDebugImage(const S32 stage = 0) = 0;
virtual void forceImmediateUpdate() = 0 ;
virtual void setActive() = 0 ;
virtual S32 getWidth(S32 discard_level = -1) const = 0 ;
virtual S32 getHeight(S32 discard_level = -1) const = 0 ;
+ virtual bool isActiveFetching() = 0;
private:
//note: do not make this function public.