Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-10-12 13:50:56 -04:00
parent d5c507ca6b eb5b1312bb
commit fb713226a0
20 changed files with 1533 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/pipeline.cpp
View File

@@ -6745,7 +6745,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
{ //combine result based on alpha
if (multisample)
{
mDeferredLight.bindTarget();
mDeferredScreen.bindTarget();
glViewport(0, 0, mDeferredScreen.getWidth(), mDeferredScreen.getHeight());
}
else
@@ -6788,7 +6788,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
if (multisample)
{
mDeferredLight.flush();
mDeferredScreen.flush();
}
}
}
@@ -6796,7 +6796,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
{
if (multisample)
{
mDeferredLight.bindTarget();
mDeferredScreen.bindTarget();
}
LLGLSLShader* shader = &gDeferredPostNoDoFProgram;
@@ -6824,7 +6824,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
if (multisample)
{
mDeferredLight.flush();
mDeferredScreen.flush();
}
}
@@ -6845,7 +6845,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
S32 channel = shader->enableTexture(LLShaderMgr::DEFERRED_DIFFUSE, mDeferredLight.getUsage());
if (channel > -1)
{
mDeferredLight.bindTexture(0, channel);
mDeferredScreen.bindTexture(0, channel);
}
gGL.begin(LLRender::TRIANGLE_STRIP);