diff options
| author | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
| commit | 957055396d2ffa3a76b09c60cb9c3e1f73870cbf (patch) | |
| tree | 632ecbdc0c21b0e14eb72f74faa8c04765f54489 /indra/newview/pipeline.h | |
| parent | ef46d4077ca4aad322aabfe545885be136577c8a (diff) | |
| parent | 59eb8a43a467ecaa5a8c2b58bf1abfb8350c0202 (diff) | |
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 11b7b55f20..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); @@ -469,9 +469,7 @@ public: //screen texture U32 mScreenWidth; U32 mScreenHeight; - U32 mViewportWidth; - U32 mViewportHeight; - + LLRenderTarget mScreen; LLRenderTarget mUIScreen; LLRenderTarget mDeferredScreen; |