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

Make gcc happier.

Browse Source
This commit is contained in:
Shyotl
2018-11-20 02:49:57 -06:00
parent 523717477d
commit 04ea11c61e
18 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llappviewer.cpp
View File

@@ -1650,8 +1650,6 @@ bool LLAppViewer::cleanup()
LLViewerObject::cleanupVOClasses();
LLAvatarAppearance::cleanupClass();
LLAvatarAppearance::cleanupClass();
LLTracker::cleanupInstance();

2
indra/newview/lldynamictexture.cpp
View File

@@ -109,7 +109,7 @@ void LLViewerDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum
}
if(fill_color)
raw_image->fill(*fill_color);
createGLTexture(0, raw_image, LLImageGL::GLTextureName(), TRUE, LLViewerTexture::DYNAMIC_TEX);
createGLTexture(0, raw_image, nullptr, TRUE, LLViewerTexture::DYNAMIC_TEX);
setAddressMode((mClamp) ? LLTexUnit::TAM_CLAMP : LLTexUnit::TAM_WRAP);
mGLTexturep->setGLTextureCreated(false);
}

2
indra/newview/llfloaterreporter.cpp
View File

@@ -783,7 +783,7 @@ void LLFloaterReporter::takeScreenshot()
// store in the image list so it doesn't try to fetch from the server
LLPointer<LLViewerFetchedTexture> image_in_list =
LLViewerTextureManager::getFetchedTexture(mResourceDatap->mAssetInfo.mUuid, FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::FETCHED_TEXTURE);
image_in_list->createGLTexture(0, raw, LLImageGL::GLTextureName(), TRUE, LLViewerTexture::OTHER);
image_in_list->createGLTexture(0, raw, nullptr, TRUE, LLViewerTexture::OTHER);
// the texture picker then uses that texture
LLTexturePicker* texture = getChild<LLTextureCtrl>("screenshot");

4
indra/newview/llviewertexture.cpp
View File

@@ -1297,7 +1297,7 @@ void LLViewerFetchedTexture::addToCreateTexture()
if(isForSculptOnly())
{
//just update some variables, not to create a real GL texture.
createGLTexture(mRawDiscardLevel, mRawImage, LLImageGL::GLTextureName(), FALSE);
createGLTexture(mRawDiscardLevel, mRawImage, nullptr, FALSE);
mNeedsCreateTexture = FALSE;
destroyRawImage();
}
@@ -1360,7 +1360,7 @@ void LLViewerFetchedTexture::addToCreateTexture()
}
// ONLY called from LLViewerTextureList
BOOL LLViewerFetchedTexture::createTexture(LLImageGL::GLTextureName& usename)
BOOL LLViewerFetchedTexture::createTexture(LLImageGL::GLTextureName* usename)
{
if (!mNeedsCreateTexture)
{

2
indra/newview/llviewertexture.h
View File

@@ -318,7 +318,7 @@ public:
void addToCreateTexture();
// ONLY call from LLViewerTextureList
BOOL createTexture(LLImageGL::GLTextureName& usename = LLImageGL::GLTextureName());
BOOL createTexture(LLImageGL::GLTextureName* usename = nullptr);
void destroyTexture() ;
virtual void processTextureStats() ;

2
indra/newview/llvosky.cpp
View File

@@ -298,7 +298,7 @@ void LLSkyTex::create(const F32 brightness)
void LLSkyTex::createGLImage(S32 which)
{
mTexture[which]->createGLTexture(0, mImageRaw[which], LLImageGL::GLTextureName(), TRUE, LLGLTexture::LOCAL);
mTexture[which]->createGLTexture(0, mImageRaw[which], nullptr, TRUE, LLGLTexture::LOCAL);
mTexture[which]->setAddressMode(LLTexUnit::TAM_CLAMP);
}