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

Added dealloc or previous image data into readImageFromTexture

Browse Source
This commit is contained in:
Robert Osfield
2004-07-05 21:46:02 +00:00
parent cce00c475b
commit 518cedf6c7
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osg/Image.cpp
View File

@@ -464,6 +464,8 @@ void Image::readImageFromCurrentTexture(unsigned int contextID, bool copyMipMaps
return;
}
deallocateData(); // and sets it to NULL.
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &internalformat);
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
@@ -478,12 +480,15 @@ void Image::readImageFromCurrentTexture(unsigned int contextID, bool copyMipMaps
_dataType = internalformat;
_internalTextureFormat = internalformat;
_mipmapData = mipMapData;
_allocationMode=USE_NEW_DELETE;
for(i=0;i<numMipMaps;++i)
{
extensions->glGetCompressedTexImage(GL_TEXTURE_2D, i, getMipmapData(i));
}
++_modifiedTag;
}
else
{
@@ -512,6 +517,8 @@ void Image::readImageFromCurrentTexture(unsigned int contextID, bool copyMipMaps
return;
}
deallocateData(); // and sets it to NULL.
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &internalformat);
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
@@ -526,12 +533,14 @@ void Image::readImageFromCurrentTexture(unsigned int contextID, bool copyMipMaps
_dataType = GL_UNSIGNED_BYTE;
_internalTextureFormat = internalformat;
_mipmapData = mipMapData;
_allocationMode=USE_NEW_DELETE;
for(i=0;i<numMipMaps;++i)
{
glGetTexImage(GL_TEXTURE_2D,i,_pixelFormat,_dataType,getMipmapData(i));
}
++_modifiedTag;
}
}