diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
| commit | ad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch) | |
| tree | 1608b2db5d620d323673607ea7ddadfba9d58bda /indra/llrender/llimagegl.h | |
| parent | a7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff) | |
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/llrender/llimagegl.h')
| -rw-r--r-- | indra/llrender/llimagegl.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index 82ea147d6e..c5fe9b7299 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -81,6 +81,10 @@ protected: virtual ~LLImageGL(); BOOL bindTextureInternal(const S32 stage = 0) const; +private: + void glClamp (BOOL clamps, BOOL clampt); + void glClampCubemap (BOOL clamps, BOOL clampt, BOOL clampr = FALSE); + public: virtual void dump(); // debugging info to llinfos virtual BOOL bind(const S32 stage = 0) const; @@ -99,8 +103,11 @@ public: BOOL readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compressed_ok); void destroyGLTexture(); + void setClampCubemap (BOOL clamps, BOOL clampt, BOOL clampr = FALSE); void setClamp(BOOL clamps, BOOL clampt); - void setMipFilterNearest(BOOL nearest, BOOL min_nearest = FALSE); + void overrideClamp (BOOL clamps, BOOL clampt); + void restoreClamp (void); + void setMipFilterNearest(BOOL mag_nearest, BOOL min_nearest = FALSE); void setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format = 0, BOOL swap_bytes = FALSE); void dontDiscard() { mDontDiscard = 1; } @@ -117,7 +124,8 @@ public: BOOL getClampS() const { return mClampS; } BOOL getClampT() const { return mClampT; } - BOOL getMipFilterNearest() const { return mMipFilterNearest; } + BOOL getClampR() const { return mClampR; } + BOOL getMipFilterNearest() const { return mMagFilterNearest; } BOOL getHasGLTexture() const { return mTexName != 0; } LLGLuint getTexName() const { return mTexName; } @@ -167,7 +175,9 @@ protected: S8 mClampS; // Need to save clamp state S8 mClampT; - S8 mMipFilterNearest; // if TRUE, set magfilter to GL_NEAREST + S8 mClampR; + S8 mMagFilterNearest; // if TRUE, set magfilter to GL_NEAREST + S8 mMinFilterNearest; // if TRUE, set minfilter to GL_NEAREST LLGLint mFormatInternal; // = GL internalformat LLGLenum mFormatPrimary; // = GL format (pixel data format) @@ -197,6 +207,9 @@ public: #else BOOL getMissed() const { return FALSE; }; #endif + +private://paranoia error check + static BOOL sRefCheck ; }; #endif // LL_LLIMAGEGL_H |