livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from default branch 

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2009-11-11 23:18:49 +02:00
parent db3991ca23 b7740ee0c5
commit b4e3d34791
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/pipeline.cpp
View File

@ -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