Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Sanity checks from snowglobe. ...

Browse Source 
-Null terminated a string buffer.
-Mutex locks are expensive.
-Realloc is my friend.
-But leaks are not.
-Nor are unused variables.
-And buffer overruns should get lost.
-bindManual shouldnt return failure if texture's already bound.
-Pulled windlight and classic clouds apart into unique rendertypes.
-'Client or Account' savedsettings stuff is now moar bettar. (and efficient)
-Replaced LLSavedSettingsGlue with something that supports gSavedSettings, gSavedPerAccountSettings, and gCOASavedSettings

-Added 'Enable Classic Clouds' checkbox to ascet performance settings panel
-New cards added to gpu table.
-General cleaning...
-How2spell 'dimensions'?
This commit is contained in:
unknown
2010-10-01 00:35:39 -05:00
parent 7b409eb7ab
commit 3e8a7172db
36 changed files with 361 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
indra/llrender/llimagegl.cpp
View File

@@ -1563,49 +1563,46 @@ void LLImageGL::setNoDelete()
//----------------------------------------------------------------------------
void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
{
if (mFormatType != GL_UNSIGNED_BYTE ||
mFormatPrimary != GL_RGBA)
{
//cannot generate a pick mask for this texture
delete [] mPickMask;
mPickMask = NULL;
mPickMaskSize = 0;
return;
}
U32 pick_width = width/2;
U32 pick_height = height/2;
mPickMaskSize = llmax(pick_width, (U32) 1) * llmax(pick_height, (U32) 1);
mPickMaskSize = mPickMaskSize/8 + 1;
delete[] mPickMask;
mPickMask = new U8[mPickMaskSize];
memset(mPickMask, 0, sizeof(U8) * mPickMaskSize);
U32 pick_bit = 0;
delete [] mPickMask; //Always happens regardless.
mPickMask = NULL;
mPickMaskSize = 0;
for (S32 y = 0; y < height; y += 2)
if (!(mFormatType != GL_UNSIGNED_BYTE ||
mFormatPrimary != GL_RGBA)) //can only generate a pick mask for this sort of texture
{
for (S32 x = 0; x < width; x += 2)
U32 pick_width = width/2;
U32 pick_height = height/2;
mPickMaskSize = llmax(pick_width, (U32) 1) * llmax(pick_height, (U32) 1);
mPickMaskSize = mPickMaskSize/8 + 1;
mPickMask = new U8[mPickMaskSize];
memset(mPickMask, 0, sizeof(U8) * mPickMaskSize);
U32 pick_bit = 0;
for (S32 y = 0; y < height; y += 2)
{
U8 alpha = data_in[(y*width+x)*4+3];
if (alpha > 32)
for (S32 x = 0; x < width; x += 2)
{
U32 pick_idx = pick_bit/8;
U32 pick_offset = pick_bit%8;
if (pick_idx >= mPickMaskSize)
{
llerrs << "WTF?" << llendl;
}
U8 alpha = data_in[(y*width+x)*4+3];
mPickMask[pick_idx] |= 1 << pick_offset;
}
if (alpha > 32)
{
U32 pick_idx = pick_bit/8;
U32 pick_offset = pick_bit%8;
if (pick_idx >= mPickMaskSize)
{
llerrs << "WTF?" << llendl;
}
mPickMask[pick_idx] |= 1 << pick_offset;
}
++pick_bit;
++pick_bit;
}
}
}
}