diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 09:54:19 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 09:54:19 -0800 |
commit | 05ae52a37f9f4d2519c40fe38f1b7143270c46ee (patch) | |
tree | ba3ea89cda34343550a909700f53ab18043a5d4a /indra/newview/pipeline.h | |
parent | e2e7d544b6a114e70e3b46f516a4f0e8d7db4bd1 (diff) | |
parent | 46b36d4fde4de97cd9960553ea77a64fbbe34b6a (diff) |
merge
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 9193e19bb1..67004a5f2d 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -111,7 +111,7 @@ public: void resizeScreenTexture(); void releaseGLBuffers(); void createGLBuffers(); - void allocateScreenBuffer(U32 resX, U32 resY, U32 viewport_width, U32 viewport_height); + void allocateScreenBuffer(U32 resX, U32 resY); void resetVertexBuffers(LLDrawable* drawable); void setUseVBO(BOOL use_vbo); @@ -467,6 +467,9 @@ public: static F32 sMinRenderSize; //screen texture + U32 mScreenWidth; + U32 mScreenHeight; + LLRenderTarget mScreen; LLRenderTarget mUIScreen; LLRenderTarget mDeferredScreen; |