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

Moved GL2Extensions functionality into the include/osg/GLExtensions header and new GLExtensions object.

Browse Source 
Moved the #defines into new include/osg/GLDefines
Converted all GL2Extensions usage to GLExtensions usage


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14593 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-12-10 10:38:12 +00:00
parent 09205544b7
commit 485709f708
66 changed files with 1355 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/BufferObject.cpp
View File

@@ -18,7 +18,7 @@
#include <osg/BufferObject>
#include <osg/Notify>
#include <osg/GLExtensions>
#include <osg/GL2Extensions>
#include <osg/GLExtensions>
#include <osg/Timer>
#include <osg/Image>
#include <osg/State>
@@ -64,7 +64,7 @@ GLBufferObject::GLBufferObject(unsigned int contextID, BufferObject* bufferObjec
{
assign(bufferObject);
_extensions = GL2Extensions::Get(contextID, true);
_extensions = GLExtensions::Get(contextID, true);
if (glObjectID==0)
{
@@ -1494,7 +1494,7 @@ void PixelDataBufferObject::bindBufferInWriteMode(State& state)
//--------------------------------------------------------------------------------
void PixelDataBufferObject::unbindBuffer(unsigned int contextID) const
{
GL2Extensions* extensions = GL2Extensions::Get(contextID, true);
GLExtensions* extensions = GLExtensions::Get(contextID, true);
switch(_mode[contextID])
{