"This submission changes deleteGLObject calls to scheduleGLObjectForDeletion, to ensure that the actual deletion happens from the correct thread (the graphics thread). This fixes the leak I reported in http://forum.openscenegraph.org/viewtopic.php?t=15567 , and possibly also http://forum.openscenegraph.org/viewtopic.php?t=15564."
165 lines
5.1 KiB
C++
165 lines
5.1 KiB
C++
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
|
|
*
|
|
* This library is open source and may be redistributed and/or modified under
|
|
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
|
|
* (at your option) any later version. The full license is in LICENSE file
|
|
* included with this distribution, and on the openscenegraph.org website.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* OpenSceneGraph Public License for more details.
|
|
*/
|
|
#include <osg/Notify>
|
|
#include <osg/GLExtensions>
|
|
#include <osg/VertexProgram>
|
|
#include <osg/State>
|
|
#include <osg/Timer>
|
|
#include <osg/ContextData>
|
|
|
|
using namespace osg;
|
|
|
|
class GLVertexProgramManager : public GLObjectManager
|
|
{
|
|
public:
|
|
GLVertexProgramManager(unsigned int contextID) : GLObjectManager("GLVertexProgramManager",contextID) {}
|
|
|
|
virtual void deleteGLObject(GLuint globj)
|
|
{
|
|
const GLExtensions* extensions = GLExtensions::Get(_contextID,true);
|
|
if (extensions->isGlslSupported) extensions->glDeletePrograms(1, &globj );
|
|
}
|
|
};
|
|
|
|
VertexProgram::VertexProgram()
|
|
{
|
|
}
|
|
|
|
|
|
VertexProgram::VertexProgram(const VertexProgram& vp,const CopyOp& copyop):
|
|
osg::StateAttribute(vp,copyop)
|
|
{
|
|
_vertexProgram = vp._vertexProgram;
|
|
|
|
for( LocalParamList::const_iterator itr = vp._programLocalParameters.begin();
|
|
itr != vp._programLocalParameters.end(); ++itr )
|
|
{
|
|
_programLocalParameters[itr->first] = itr->second;
|
|
}
|
|
|
|
for( MatrixList::const_iterator mitr = vp._matrixList.begin();
|
|
mitr != vp._matrixList.end(); ++mitr )
|
|
{
|
|
_matrixList[mitr->first] = mitr->second;
|
|
}
|
|
}
|
|
|
|
|
|
// virtual
|
|
VertexProgram::~VertexProgram()
|
|
{
|
|
dirtyVertexProgramObject();
|
|
}
|
|
|
|
void VertexProgram::dirtyVertexProgramObject()
|
|
{
|
|
for(unsigned int i=0;i<_vertexProgramIDList.size();++i)
|
|
{
|
|
if (_vertexProgramIDList[i] != 0)
|
|
{
|
|
osg::get<GLVertexProgramManager>(i)->scheduleGLObjectForDeletion(_vertexProgramIDList[i]);
|
|
_vertexProgramIDList[i] = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
void VertexProgram::apply(State& state) const
|
|
{
|
|
#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
|
|
|
|
const GLExtensions* extensions = state.get<GLExtensions>();
|
|
|
|
if (!extensions->isVertexProgramSupported)
|
|
return;
|
|
|
|
|
|
GLuint& vertexProgramId=getVertexProgramID(state.getContextID());
|
|
|
|
// Vertex Program
|
|
if (vertexProgramId != 0)
|
|
{
|
|
extensions->glBindProgram( GL_VERTEX_PROGRAM_ARB, vertexProgramId );
|
|
}
|
|
else if (!_vertexProgram.empty())
|
|
{
|
|
glGetError(); // Reset Error flags.
|
|
extensions->glGenPrograms( 1, &vertexProgramId );
|
|
extensions->glBindProgram( GL_VERTEX_PROGRAM_ARB, vertexProgramId );
|
|
extensions->glProgramString( GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
|
|
_vertexProgram.length(), _vertexProgram.c_str());
|
|
|
|
// Check for errors
|
|
GLint errorposition = 0;
|
|
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorposition);
|
|
if (errorposition != -1)
|
|
{
|
|
OSG_FATAL << "VertexProgram: " << glGetString(GL_PROGRAM_ERROR_STRING_ARB) << std::endl;
|
|
|
|
std::string::size_type start = _vertexProgram.rfind('\n', errorposition);
|
|
std::string::size_type stop = _vertexProgram.find('\n', errorposition);
|
|
if (start!=std::string::npos && stop!=std::string::npos)
|
|
{
|
|
OSG_FATAL << " : " << _vertexProgram.substr(start+1, stop-start-2) << std::endl;
|
|
std::string pointAtproblem(errorposition-(start+1), ' ');
|
|
OSG_FATAL << " : " << pointAtproblem << '^' << std::endl;
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Update local program parameters
|
|
{
|
|
for(LocalParamList::const_iterator itr=_programLocalParameters.begin();
|
|
itr!=_programLocalParameters.end();
|
|
++itr)
|
|
{
|
|
extensions->glProgramLocalParameter4fv(GL_VERTEX_PROGRAM_ARB, (*itr).first, (*itr).second.ptr());
|
|
}
|
|
}
|
|
|
|
// Update matrix
|
|
if (!_matrixList.empty())
|
|
{
|
|
for(MatrixList::const_iterator itr = _matrixList.begin();
|
|
itr!=_matrixList.end();
|
|
++itr)
|
|
{
|
|
glMatrixMode((*itr).first);
|
|
glLoadMatrix((*itr).second.ptr());
|
|
}
|
|
glMatrixMode(GL_MODELVIEW); // restore matrix mode
|
|
}
|
|
#else
|
|
OSG_NOTICE<<"Warning: VertexProgram::apply(State&) - not supported."<<std::endl;
|
|
#endif
|
|
}
|
|
|
|
void VertexProgram::resizeGLObjectBuffers(unsigned int maxSize)
|
|
{
|
|
_vertexProgramIDList.resize(maxSize);
|
|
}
|
|
|
|
void VertexProgram::releaseGLObjects(State* state) const
|
|
{
|
|
if (!state) const_cast<VertexProgram*>(this)->dirtyVertexProgramObject();
|
|
else
|
|
{
|
|
unsigned int contextID = state->getContextID();
|
|
if (_vertexProgramIDList[contextID] != 0)
|
|
{
|
|
osg::get<GLVertexProgramManager>(contextID)->scheduleGLObjectForDeletion(_vertexProgramIDList[contextID]);
|
|
_vertexProgramIDList[contextID] = 0;
|
|
}
|
|
}
|
|
}
|