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

sDelayedVBOEnable is still required to prevent framerates from getting clobbered on gl context change.

Browse Source
This commit is contained in:
Shyotl
2012-02-03 14:25:51 -06:00
parent bf44d3f98e
commit e18e051bfc
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/pipeline.cpp
View File

@@ -158,7 +158,7 @@ extern BOOL gDebugGL;
// hack counter for rendering a fixed number of frames after toggling // hack counter for rendering a fixed number of frames after toggling
// fullscreen to work around DEV-5361 // fullscreen to work around DEV-5361
//static S32 sDelayedVBOEnable = 0; static S32 sDelayedVBOEnable = 0;
BOOL gAvatarBacklight = FALSE; BOOL gAvatarBacklight = FALSE;
@@ -556,9 +556,12 @@ void LLPipeline::destroyGL()
if (LLVertexBuffer::sEnableVBOs) if (LLVertexBuffer::sEnableVBOs)
{ {
// render 30 frames after switching to work around DEV-5361 // render 30 frames after switching to work around DEV-5361
//sDelayedVBOEnable = 30; if(!LLRenderTarget::sUseFBO)
{
sDelayedVBOEnable = 30;
LLVertexBuffer::sEnableVBOs = FALSE; LLVertexBuffer::sEnableVBOs = FALSE;
} }
}
} }
static LLFastTimer::DeclareTimer FTM_RESIZE_SCREEN_TEXTURE("Resize Screen Texture"); static LLFastTimer::DeclareTimer FTM_RESIZE_SCREEN_TEXTURE("Resize Screen Texture");
@@ -580,6 +583,7 @@ void LLPipeline::throttleNewMemoryAllocation(BOOL disable)
} }
} }
} }
void LLPipeline::resizeScreenTexture() void LLPipeline::resizeScreenTexture()
{ {
LLFastTimer ft(FTM_RESIZE_SCREEN_TEXTURE); LLFastTimer ft(FTM_RESIZE_SCREEN_TEXTURE);
@@ -2331,14 +2335,14 @@ void LLPipeline::updateGeom(F32 max_dtime)
assertInitialized(); assertInitialized();
/*if (sDelayedVBOEnable > 0) if (sDelayedVBOEnable > 0)
{ {
if (--sDelayedVBOEnable <= 0) if (--sDelayedVBOEnable <= 0)
{ {
resetVertexBuffers(); resetVertexBuffers();
LLVertexBuffer::sEnableVBOs = TRUE; LLVertexBuffer::sEnableVBOs = TRUE;
} }
}*/ }
// notify various object types to reset internal cost metrics, etc. // notify various object types to reset internal cost metrics, etc.
// for now, only LLVOVolume does this to throttle LOD changes // for now, only LLVOVolume does this to throttle LOD changes