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

remove old BindImageTexture path

Browse Source
This commit is contained in:
Julien Valentin
2018-01-02 18:29:42 +01:00
parent f9b1c614bc
commit c605b24432
4 changed files with 20 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osg/TextureBuffer.cpp
View File

@@ -160,7 +160,6 @@ void TextureBuffer::apply(State& state) const
#endif
if (textureObject)
{
const GLExtensions* extensions = state.get<GLExtensions>();
if(_bufferData.valid() &&_modifiedCount[contextID]!=_bufferData->getModifiedCount() )
{
_modifiedCount[contextID]=_bufferData->getModifiedCount() ;
@@ -178,18 +177,6 @@ void TextureBuffer::apply(State& state) const
}
textureObject->bind();
if( getTextureParameterDirty(contextID) )
{
if( extensions->isBindImageTextureSupported() && _imageAttachment.access!=0 )
{
extensions->glBindImageTexture(
_imageAttachment.unit, textureObject->id(), _imageAttachment.level,
_imageAttachment.layered, _imageAttachment.layer, _imageAttachment.access,
_imageAttachment.format!=0 ? _imageAttachment.format : _internalFormat);
}
getTextureParameterDirty(state.getContextID()) = false;
}
}
else if (_bufferData.valid() &&_bufferData->getBufferObject() )//&& _bufferObject->getNumBufferData()>0 )
{
@@ -205,13 +192,6 @@ void TextureBuffer::apply(State& state) const
textureObject->_profile._internalFormat=_internalFormat;
textureObject->bind();
if ( extensions->isBindImageTextureSupported() && _imageAttachment.access!=0 )
{
extensions->glBindImageTexture(
_imageAttachment.unit, textureObject->id(), _imageAttachment.level,
_imageAttachment.layered, _imageAttachment.layer, _imageAttachment.access,
_imageAttachment.format!=0 ? _imageAttachment.format : _internalFormat);
}
getTextureParameterDirty(state.getContextID()) = false;
computeInternalFormat();
@@ -239,4 +219,3 @@ void TextureBuffer::computeInternalFormat() const
if (getImage() ) computeInternalFormatWithImage(*getImage());
else computeInternalFormatType();
}