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

From Lionel Lagarde, "Support for paging and shared PBO"

Browse Source 
"The attached file contains:
- a per-context read counter in GLBufferObject::BufferEntry
- a global client counter in BufferData
- the glue between Texture* and Image client counter
"
This commit is contained in:
Robert Osfield
2013-06-27 16:44:32 +00:00
parent 57947ea75c
commit 9f13e2fcb9
10 changed files with 180 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/osg/TextureCubeMap.cpp
View File

@@ -48,28 +48,24 @@ TextureCubeMap::TextureCubeMap(const TextureCubeMap& text,const CopyOp& copyop):
_numMipmapLevels(text._numMipmapLevels),
_subloadCallback(text._subloadCallback)
{
_images[0] = copyop(text._images[0].get());
_images[1] = copyop(text._images[1].get());
_images[2] = copyop(text._images[2].get());
_images[3] = copyop(text._images[3].get());
_images[4] = copyop(text._images[4].get());
_images[5] = copyop(text._images[5].get());
_modifiedCount[0].setAllElementsTo(0);
_modifiedCount[1].setAllElementsTo(0);
_modifiedCount[2].setAllElementsTo(0);
_modifiedCount[3].setAllElementsTo(0);
_modifiedCount[4].setAllElementsTo(0);
_modifiedCount[5].setAllElementsTo(0);
setImage(0, copyop(text._images[0].get()));
setImage(1, copyop(text._images[1].get()));
setImage(2, copyop(text._images[2].get()));
setImage(3, copyop(text._images[3].get()));
setImage(4, copyop(text._images[4].get()));
setImage(5, copyop(text._images[5].get()));
}
TextureCubeMap::~TextureCubeMap()
{
setImage(0, NULL);
setImage(1, NULL);
setImage(2, NULL);
setImage(3, NULL);
setImage(4, NULL);
setImage(5, NULL);
}
int TextureCubeMap::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
@@ -126,7 +122,7 @@ int TextureCubeMap::compare(const StateAttribute& sa) const
}
void TextureCubeMap::setImage( unsigned int face, Image* image)
void TextureCubeMap::setImage(unsigned int face, Image* image)
{
if (_images[face] == image) return;
@@ -136,9 +132,18 @@ void TextureCubeMap::setImage( unsigned int face, Image* image)
if (_images[i].valid() && _images[i]->requiresUpdateCall()) ++numImageRequireUpdateBefore;
}
if (_images[face].valid())
{
_images[face]->removeClient(this);
}
_images[face] = image;
_modifiedCount[face].setAllElementsTo(0);
if (_images[face].valid())
{
_images[face]->addClient(this);
}
// find out if we need to reset the update callback to handle the animation of image
unsigned numImageRequireUpdateAfter = 0;