summaryrefslogtreecommitdiff
path: root/indra/llrender/llrendertarget.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-07-23 23:07:16 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-07-23 23:07:16 -0600
commit52f292c0637545171749aee18e305c530a76d096 (patch)
tree8d4446da954686b31450078ef0d609cff17c1116 /indra/llrender/llrendertarget.h
parent40a7c63e897cee5905270602be4387f5eb4fc2b8 (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merge
Diffstat (limited to 'indra/llrender/llrendertarget.h')
-rwxr-xr-xindra/llrender/llrendertarget.h6
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;