diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
| commit | cf33a9a7b31b19d0f87e11997aaba938a8ee950d (patch) | |
| tree | f64996ebb904ec562447be92b2e5273b9261d41c /indra/llrender/llrendertarget.h | |
| parent | 1108cd0e5c052176f9dacc69b04d702a06b744de (diff) | |
| parent | e12b6caaa0596eae2fad43636663dd4e14a1949c (diff) | |
merge changes for storm-1951
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; |