Merge

1 files changed, 13 insertions, 19 deletions

diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 6d59b687f3..527f400c03 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -95,6 +95,7 @@ BOOL gForceRenderLandFence = FALSE;
 BOOL gDisplaySwapBuffers = FALSE;

 BOOL gDepthDirty = FALSE;

 BOOL gResizeScreenTexture = FALSE;

+BOOL gWindowResized = FALSE;

 BOOL gSnapshot = FALSE;

 

 U32 gRecentFrameCount = 0; // number of 'recent' frames

@@ -218,22 +219,15 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 	LLMemType mt_render(LLMemType::MTYPE_RENDER);

 	LLFastTimer t(FTM_RENDER);

 

-	if (gResizeScreenTexture)

-	{ //skip render on frames where screen texture is resizing

+	if (gWindowResized)

+	{ //skip render on frames where window has been resized

 		gGL.flush();

-		if (!for_snapshot)

-		{

-			glClear(GL_COLOR_BUFFER_BIT);

-			gViewerWindow->mWindow->swapBuffers();

-		}

-	

-		gResizeScreenTexture = FALSE;

+		glClear(GL_COLOR_BUFFER_BIT);

+		gViewerWindow->mWindow->swapBuffers();

 		gPipeline.resizeScreenTexture();

-

-		if (!for_snapshot)

-		{

-			return;

-		}

+		gResizeScreenTexture = FALSE;

+		gWindowResized = FALSE;

+		return;

 	}

 

 	if (LLPipeline::sRenderDeferred)

@@ -666,11 +660,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 				LLVertexBuffer::clientCopy(0.016);

 			}

 

-			//if (gResizeScreenTexture)

-			//{

-			//	gResizeScreenTexture = FALSE;

-			//	gPipeline.resizeScreenTexture();

-			//}

+			if (gResizeScreenTexture)

+			{

+				gResizeScreenTexture = FALSE;

+				gPipeline.resizeScreenTexture();

+			}

 

 			gGL.setColorMask(true, true);

 			glClearColor(0,0,0,0);