FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored texture sharing code so that it modifies the RefAttributePair directly thus honouring the override flags and fixing a bug of loosing these override flags when sharing

Browse Source
This commit is contained in:
Robert Osfield
2016-09-20 17:23:37 +01:00
parent b0df75e674
commit 7e0c30b884
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgDB/SharedStateManager.cpp
View File

@@ -175,7 +175,10 @@ void SharedStateManager::shareTextures(osg::StateSet* ss)
const osg::StateSet::TextureAttributeList& texAttributes = ss->getTextureAttributeList();
for(unsigned int unit=0;unit<texAttributes.size();++unit)
{
osg::StateAttribute *texture = ss->getTextureAttribute(unit, osg::StateAttribute::TEXTURE);
osg::StateSet::RefAttributePair* pair = ss->getTextureAttributePair(unit, osg::StateAttribute::TEXTURE);
if (!pair) continue;
osg::StateAttribute* texture = pair->first.get();
// Valid Texture to be shared
if(texture && shareTexture(texture->getDataVariance()))
@@ -185,13 +188,13 @@ void SharedStateManager::shareTextures(osg::StateSet* ss)
{
// Texture is not in tmp list:
// First time it appears in this file, search Texture in sharedAttributeList
osg::StateAttribute *textureFromSharedList = find(texture);
osg::StateAttribute* textureFromSharedList = find(texture);
if(textureFromSharedList)
{
// Texture is in sharedAttributeList:
// Share now. Required to be shared all next times
if(_mutex) _mutex->lock();
ss->setTextureAttributeAndModes(unit, textureFromSharedList, osg::StateAttribute::ON);
pair->first = textureFromSharedList;
if(_mutex) _mutex->unlock();
tmpSharedTextureList[texture] = TextureSharePair(textureFromSharedList, true);
}
@@ -210,7 +213,7 @@ void SharedStateManager::shareTextures(osg::StateSet* ss)
// Texture is in tmpSharedAttributeList and share flag is on:
// It should be shared
if(_mutex) _mutex->lock();
ss->setTextureAttributeAndModes(unit, titr->second.first, osg::StateAttribute::ON);
pair->first = titr->second.first;
if(_mutex) _mutex->unlock();
}
}