From f80a5468b9757059b0179fb8feb40a5e73d9e341 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Fri, 8 Aug 2014 22:28:55 -0400
Subject: [PATCH] I really don't care if we crash while resizing the window in
this case. This adds some rather slow IO -,-
---
indra/newview/pipeline.cpp | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1e01404934..b2f49b3f0c 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -837,22 +837,22 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY)
{
refreshCachedSettings();
- bool save_settings = sRenderDeferred;
- if (save_settings)
- {
- // Set this flag in case we crash while resizing window or allocating space for deferred rendering targets
- gSavedSettings.setBOOL("RenderInitError", TRUE);
- gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
- }
+ //bool save_settings = sRenderDeferred;
+ //if (save_settings)
+ //{
+ // // Set this flag in case we crash while resizing window or allocating space for deferred rendering targets
+ // gSavedSettings.setBOOL("RenderInitError", TRUE);
+ // gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
+ //}
eFBOStatus ret = doAllocateScreenBuffer(resX, resY);
- if (save_settings)
- {
- // don't disable shaders on next session
- gSavedSettings.setBOOL("RenderInitError", FALSE);
- gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
- }
+ //if (save_settings)
+ //{
+ // // don't disable shaders on next session
+ // gSavedSettings.setBOOL("RenderInitError", FALSE);
+ // gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
+ //}
if (ret == FBO_FAILURE)
{ //FAILSAFE: screen buffer allocation failed, disable deferred rendering if it's enabled
--
GitLab