Tweaked context-recreation logic to force a 0xAA context when fbos are in use. Should also handle toggling of fbo checkbox a bit gracefully as well.

This commit is contained in:
Shyotl
2014-05-08 15:48:08 -05:00
parent 162e7b7699
commit f0763fd31c
3 changed files with 15 additions and 4 deletions

View File

@@ -1654,7 +1654,7 @@ LLViewerWindow::LLViewerWindow(
vsync_mode,
!gNoRender,
ignore_pixel_depth,
gSavedSettings.getBOOL("RenderUseFBO") ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled
LLRenderTarget::sUseFBO ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled
if (!LLViewerShaderMgr::sInitialized)
{ //immediately initialize shaders
@@ -5500,7 +5500,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
return TRUE;
}
U32 fsaa = gSavedSettings.getU32("RenderFSAASamples");
U32 fsaa = LLRenderTarget::sUseFBO ? 0 : gSavedSettings.getU32("RenderFSAASamples"); //don't use window level anti-aliasing if FBOs are enabled
U32 old_fsaa = mWindow->getFSAASamples();
// going from windowed to windowed