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

Reduce required number of glow rendertargets by 1...

Browse Source
This commit is contained in:
Shyotl
2012-12-10 01:31:57 -06:00
parent a4591a5eaa
commit 806abb1985
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/pipeline.cpp
View File

@@ -865,7 +865,7 @@ void LLPipeline::releaseGLBuffers()
mWaterRef.release();
mWaterDis.release();
for (U32 i = 0; i < 3; i++)
for (U32 i = 0; i < 2; i++)
{
mGlow[i].release();
}
@@ -936,7 +936,7 @@ void LLPipeline::createGLBuffers()
const U32 glow_res = llmax(1,
llmin(512, 1 << gSavedSettings.getS32("RenderGlowResolutionPow")));
for (U32 i = 0; i < 3; i++)
for (U32 i = 0; i < 2; i++)
{
mGlow[i].allocate(512,glow_res,GL_RGBA,FALSE,FALSE);
}
@@ -6517,8 +6517,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
{
{
LLFastTimer ftm(FTM_RENDER_BLOOM_FBO);
mGlow[2].bindTarget();
mGlow[2].clear();
mGlow[1].bindTarget();
mGlow[1].clear();
}
gGlowExtractProgram.bind();
@@ -6557,7 +6557,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
gGL.getTexUnit(0)->unbind(mScreen.getUsage());
mGlow[2].flush();
mGlow[1].flush();
}
tc1.setVec(0,0);
@@ -6589,14 +6589,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
mGlow[i%2].clear();
}
if (i == 0)
{
gGL.getTexUnit(0)->bind(&mGlow[2]);
}
else
{
gGL.getTexUnit(0)->bind(&mGlow[(i-1)%2]);
}
gGL.getTexUnit(0)->bind(&mGlow[(i+1)%2]);
if (i%2 == 0)
{

2
indra/newview/pipeline.h
View File

@@ -585,7 +585,7 @@ public:
LLRenderTarget mWaterDis;
//texture for making the glow
LLRenderTarget mGlow[3];
LLRenderTarget mGlow[2];
//noise map
U32 mNoiseMap;