diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 23:18:49 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 23:18:49 +0200 |
| commit | b4e3d34791497188537680a4556ccacaa004db09 (patch) | |
| tree | 552373cfe6600438234842c15968a64fec02ef6e /indra/newview | |
| parent | db3991ca235f3ceefe888d03758cac5eccf1b552 (diff) | |
| parent | b7740ee0c540c884170ffacf88132af3f93a3f96 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/pipeline.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 73a91bbbc0..507c726e02 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -512,10 +512,10 @@ void LLPipeline::resizeScreenTexture() LLFastTimer ft(FTM_RESIZE_SCREEN_TEXTURE); if (gPipeline.canUseVertexShaders() && assertInitialized()) { - GLuint resX = gViewerWindow->getWorldViewWidthRaw(); - GLuint resY = gViewerWindow->getWorldViewHeightRaw(); - GLuint view_width = gViewerWindow->getWorldViewWidth(); - GLuint view_height = gViewerWindow->getWorldViewHeight(); + GLuint resX = gViewerWindow->getWindowWidthRaw(); + GLuint resY = gViewerWindow->getWindowHeightRaw(); + GLuint view_width = gViewerWindow->getWorldViewWidthRaw(); + GLuint view_height = gViewerWindow->getWorldViewHeightRaw(); allocateScreenBuffer(resX, resY, view_width, view_height); @@ -711,10 +711,10 @@ void LLPipeline::createGLBuffers() stop_glerror(); - GLuint resX = gViewerWindow->getWorldViewWidthRaw(); - GLuint resY = gViewerWindow->getWorldViewHeightRaw(); - GLuint viewport_width = gViewerWindow->getWorldViewWidth(); - GLuint viewport_height = gViewerWindow->getWorldViewHeight(); + GLuint resX = gViewerWindow->getWindowWidthRaw(); + GLuint resY = gViewerWindow->getWindowHeightRaw(); + GLuint viewport_width = gViewerWindow->getWorldViewWidthRaw(); + GLuint viewport_height = gViewerWindow->getWorldViewHeightRaw(); if (LLPipeline::sRenderGlow) { //screen space glow buffers |