diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-07-15 13:29:10 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-07-15 13:29:10 -0700 |
| commit | 8a3753b7beb019fabc2077245b2f328fe1769abf (patch) | |
| tree | 45f032edad56fb5063800d48cc6337d7d6bceb6e /indra/llrender/llrendertarget.h | |
| parent | 7414490a7a068f14d34fff104476647f5057cf35 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Pull merge from lindenlab/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 765a727b5b..66a9874a6b 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(); @@ -146,6 +149,9 @@ protected: std::vector<U32> mInternalFormat; U32 mFBO; U32 mPreviousFBO; + U32 mPreviousResX; + U32 mPreviousResY; + U32 mDepth; bool mStencil; bool mUseDepth; |