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

Moved GLBufferObject::Extensions structure into osg::GL2Extensions

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14570 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-04 18:13:11 +00:00
parent 69407f4054
commit d02c0bdc49
9 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/BufferObject.cpp
View File

@@ -64,7 +64,7 @@ GLBufferObject::GLBufferObject(unsigned int contextID, BufferObject* bufferObjec
{
assign(bufferObject);
_extensions = GLBufferObject::getExtensions(contextID, true);
_extensions = GL2Extensions::Get(contextID, true);
if (glObjectID==0)
{
@@ -264,6 +264,7 @@ void GLBufferObject::setBufferDataHasBeenRead(const osg::BufferData* bd)
++entry.numRead;
}
#if 0
//////////////////////////////////////////////////////////////////////////////
//
// Extension support
@@ -448,6 +449,7 @@ void GLBufferObject::Extensions::glTexBuffer( GLenum target, GLenum internalForm
if ( _glTexBuffer ) _glTexBuffer( target, internalFormat, buffer );
else OSG_WARN<<"Error: glTexBuffer not supported by OpenGL driver\n";
}
#endif
//////////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -1679,7 +1681,7 @@ void PixelDataBufferObject::bindBufferInWriteMode(State& state)
//--------------------------------------------------------------------------------
void PixelDataBufferObject::unbindBuffer(unsigned int contextID) const
{
GLBufferObject::Extensions* extensions = GLBufferObject::getExtensions(contextID,true);
GL2Extensions* extensions = GL2Extensions::Get(contextID, true);
switch(_mode[contextID])
{