diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-01 15:59:08 -0700 |
commit | f07b332ef0aafd1ecb82b6077309a5292c9cddc1 (patch) | |
tree | a76fabd4f71bdbb86b7fe6efb9a6acc0529a429c /indra/llrender/llimagegl.h | |
parent | baa81473149b9d5a6718529c4de08393e8a02b92 (diff) | |
parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) |
Merge branch 'master' into DV525-merge-6.4.13
Diffstat (limited to 'indra/llrender/llimagegl.h')
-rw-r--r-- | indra/llrender/llimagegl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index 4f3d7eed0a..61ddc8d59b 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -133,6 +133,7 @@ public: S32 getMipBytes(S32 discard_level = -1) const; BOOL getBoundRecently() const; BOOL isJustBound() const; + BOOL getHasExplicitFormat() const { return mHasExplicitFormat; } LLGLenum getPrimaryFormat() const { return mFormatPrimary; } LLGLenum getFormatType() const { return mFormatType; } @@ -197,7 +198,7 @@ private: U16 mPickMaskWidth; U16 mPickMaskHeight; S8 mUseMipMaps; - S8 mHasExplicitFormat; // If false (default), GL format is f(mComponents) + BOOL mHasExplicitFormat; // If false (default), GL format is f(mComponents) S8 mAutoGenMips; BOOL mIsMask; |