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

Removed maximum_alpha uniform (as it's always 1.0 anyhow)

Browse Source
This commit is contained in:
Shyotl
2011-11-19 15:13:16 -06:00
parent ee5a9c97be
commit 1fd908b2c4
21 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llrender/llimagegl.cpp
View File

@@ -741,7 +741,10 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
{
if (mAutoGenMips)
{
glTexParameteri(LLTexUnit::getInternalType(mBindTarget), GL_GENERATE_MIPMAP_SGIS, TRUE);
if (!gGLManager.mHasFramebufferObject)
{
glTexParameteri(LLTexUnit::getInternalType(mBindTarget), GL_GENERATE_MIPMAP_SGIS, TRUE);
}
stop_glerror();
{
// LLFastTimer t2(LLFastTimer::FTM_TEMP4);
@@ -770,6 +773,12 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
stop_glerror();
}
}
if (gGLManager.mHasFramebufferObject)
{
//GL_EXT_framebuffer_object implies glGenerateMipmap
glGenerateMipmap(LLTexUnit::getInternalType(mBindTarget));
}
}
else
{