diff options
author | callum_linden <none@none> | 2013-06-28 13:36:41 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2013-06-28 13:36:41 -0700 |
commit | bd41392b7ec1dd90cd0039d87bbbef8beda1796a (patch) | |
tree | aa01ba89c055c5ed427c25227f894fd41b55a220 /indra/llrender/llrendertarget.h | |
parent | 4696eeeb30ce4d01c3bcbe74c9024f05d848968a (diff) | |
parent | b6b4b5913827ca864dac94c72a127f520288ef8e (diff) |
Merge with viewer-bear which was just merged with viewer-release
Diffstat (limited to 'indra/llrender/llrendertarget.h')
-rwxr-xr-x | indra/llrender/llrendertarget.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h index a7bc4e1385..740e25d40d 100755 --- a/indra/llrender/llrendertarget.h +++ b/indra/llrender/llrendertarget.h @@ -63,6 +63,9 @@ public: static bool sUseFBO; static U32 sBytesAllocated; static U32 sCurFBO; + static U32 sCurResX; + static U32 sCurResY; + LLRenderTarget(); ~LLRenderTarget(); @@ -147,6 +150,9 @@ protected: std::vector<U32> mInternalFormat; U32 mFBO; U32 mPreviousFBO; + U32 mPreviousResX; + U32 mPreviousResY; + U32 mDepth; bool mStencil; bool mUseDepth; |