From 94d844e1876461ad2e2ad385555ce9a0a7e60088 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 4 Sep 2018 23:44:41 +0100 Subject: Remove MSVC debug pragmas. --- indra/newview/llviewershadermgr.cpp | 2 -- indra/newview/llvosky.cpp | 2 -- 2 files changed, 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 05c722a114..cd378c0a56 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -46,8 +46,6 @@ #include "llenvironment.h" #include "llatmosphere.h" -#pragma optimize("", off) - #ifdef LL_RELEASE_FOR_DOWNLOAD #define UNIFORM_ERRS LL_WARNS_ONCE("Shader") #else diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index d3b1f1459f..e02550c77b 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -59,8 +59,6 @@ #undef min #undef max -#pragma optimize("", off) - namespace { const S32 NUM_TILES_X = 8; -- cgit v1.2.3 From 5db0338aceebb04cd143a71f393f15dfebe8ad3a Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 4 Sep 2018 23:47:52 +0100 Subject: Put back less debuggable but more terse accum of update conditions. --- indra/newview/llvosky.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index e02550c77b..b52b8f1587 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -642,23 +642,9 @@ bool LLVOSky::updateSky() bool light_direction_changed = (dot_lighting < LIGHT_DIRECTION_THRESHOLD); bool color_changed = (delta_color.length() >= COLOR_CHANGE_THRESHOLD); - if (light_direction_changed) - { - mForceUpdate = true; - } - - if (color_changed) - { - mForceUpdate = true; - } - - if (!mInitialized) - { - mForceUpdate = true; - } - //mForceUpdate = mForceUpdate || light_direction_changed; - //mForceUpdate = mForceUpdate || color_changed; - //mForceUpdate = mForceUpdate || !mInitialized; + mForceUpdate = mForceUpdate || light_direction_changed; + mForceUpdate = mForceUpdate || color_changed; + mForceUpdate = mForceUpdate || !mInitialized; if (mForceUpdate && mForceUpdateThrottle.hasExpired()) { -- cgit v1.2.3