diff --git a/indra/newview/llpatchvertexarray.cpp b/indra/newview/llpatchvertexarray.cpp index 0d40348fd1..9f2147d572 100644 --- a/indra/newview/llpatchvertexarray.cpp +++ b/indra/newview/llpatchvertexarray.cpp @@ -78,35 +78,35 @@ void LLPatchVertexArray::create(U32 surface_width, U32 patch_width, F32 meters_p // FIRE-8063 - Aurora non power of two regions //if (power_of_two == (surface_width-1)) if (power_of_two != (surface_width-1)) - { - surface_width = power_of_two + 1; + { + surface_width = power_of_two + 1; } -// - - mSurfaceWidth = surface_width; - - // Make sure patch_width is a factor of (surface_width - 1) - U32 ratio = (surface_width - 1) / patch_width; - F32 fratio = ((float)(surface_width - 1)) / ((float)(patch_width)); +// + + mSurfaceWidth = surface_width; + + // Make sure patch_width is a factor of (surface_width - 1) + U32 ratio = (surface_width - 1) / patch_width; + F32 fratio = ((float)(surface_width - 1)) / ((float)(patch_width)); if ( fratio == (float)(ratio)) { - // Make sure patch_width is a power of two - power_of_two = 1; - U32 patch_order = 0; + // Make sure patch_width is a power of two + power_of_two = 1; + U32 patch_order = 0; while (power_of_two < patch_width) { - power_of_two *= 2; + power_of_two *= 2; patch_order += 1; } // FIRE-8063 - Aurora non power of two regions //if (power_of_two == patch_width) if (power_of_two != patch_width) - { + { patch_width = power_of_two; } // - mPatchWidth = patch_width; + mPatchWidth = patch_width; mPatchOrder = patch_order; // FIRE-8063 - Aurora non power of two regions diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 221de12e10..d9ca846088 100755 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -798,17 +798,17 @@ void send_stats() S32 shader_level = 0; if (LLPipeline::sRenderDeferred) { - if (LLPipeline::RenderShadowDetail > 0) - { - shader_level = 5; - } - else if (LLPipeline::RenderDeferredSSAO) - { - shader_level = 4; - } - else - { - shader_level = 3; + if (LLPipeline::RenderShadowDetail > 0) + { + shader_level = 5; + } + else if (LLPipeline::RenderDeferredSSAO) + { + shader_level = 4; + } + else + { + shader_level = 3; } } else if (gPipeline.canUseWindLightShadersOnObjects())