livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Line endings conversion, from Windows to Unix format; No code changes

meow-7.2.2
PanteraPolnocy 2012-12-16 23:23:21 +01:00
parent 7a9dc376de
commit 8afcec3377
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llpatchvertexarray.cpp
View File

@ -78,35 +78,35 @@ void LLPatchVertexArray::create(U32 surface_width, U32 patch_width, F32 meters_p
// <FS:CR> 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;
}
// </FS:CR>
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));
// </FS:CR>
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;
}
// <FS:CR> 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;
}
// </FS:CR>
mPatchWidth = patch_width;
mPatchWidth = patch_width;
mPatchOrder = patch_order;
// <FS:CR> FIRE-8063 - Aurora non power of two regions

22
indra/newview/llviewerstats.cpp
View File

@ -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())