Wedged high-res non-tiled deferred snapshot logic into LLViewerWindow::rawRawSnapshot

This commit is contained in:
Shyotl
2013-02-25 12:59:17 -06:00
parent 34cf0329ab
commit fd21197d2a
4 changed files with 85 additions and 38 deletions

View File

@@ -1020,7 +1020,7 @@ void LLPipeline::createGLBuffers()
{
mGlow[i].bindTarget();
mGlow[i].clear();
mGlow[i].unbindTarget();
mGlow[i].flush();
}
}
@@ -6728,11 +6728,11 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
gGlowProgram.unbind();
if (LLRenderTarget::sUseFBO)
/*if (LLRenderTarget::sUseFBO)
{
LLFastTimer ftm(FTM_RENDER_BLOOM_FBO);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
}
}*/
gGLViewport[0] = gViewerWindow->getWorldViewRectRaw().mLeft;
gGLViewport[1] = gViewerWindow->getWorldViewRectRaw().mBottom;
@@ -8414,8 +8414,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
}
last_update = LLDrawPoolWater::sNeedsReflectionUpdate && LLDrawPoolWater::sNeedsDistortionUpdate;
LLRenderTarget::unbindTarget();
LLPipeline::sReflectionRender = FALSE;
if (!LLRenderTarget::sUseFBO)