diff options
| author | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
| commit | d26567915cd80999260edffc41df467a7cbbd80c (patch) | |
| tree | 84072d2a7a5e6afa7b57850ed4b325439cb2be16 /indra/llrender/llimagegl.h | |
| parent | 7528855442a100cee379b9e409280a69caa78bba (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge with Master after Viewer release
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; |