Hi Robert,
Changeset 10833 renames discardAllDeletedGLObjects() to
discardAllGLObjects() in src/osg/GLObjects.cpp, but the declaration of
the function in include/osg/GLObjects remained. So an app using an old
version of OSG that called this function would now fail with a linker
error instead of a compile error as it should.
Removed the declaration. Also fixed a small typo in the following
doxygen comment.
I'm currently compiling our framework, previously compiled against OSG
2.8.3, against trunk to test it out, and aside from the change of
MatrixManipulator to CameraManipulator, and the removal of the EXT
suffixes in FBOExtensions, this was the only thing I tripped on. I
haven't yet done any runtime testing but I don't expect any trouble now
that it compiles. (isn't compilation proof that it works? :-) )
Thanks,
J-S
--
______________________________________________________
Jean-Sebastien Guay [email protected]
http://www.cm-labs.com/
http://whitestar02.webhop.org/
/* -*-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.
*/
#ifndef OSG_GLOBJECTS
#define OSG_GLOBJECTS 1
#include <osg/Export>
namespace osg {
/** Flush all deleted OpenGL objects within the specified availableTime.
* Note, must be called from a thread which has current the graphics context
associated with contextID. */
extern OSG_EXPORT void flushDeletedGLObjects(unsigned int contextID, double
currentTime, double& availableTime);
/** Flush all deleted OpenGL objects.
* Note, must be called from a thread which has current the graphics context
associated with contextID. */
extern OSG_EXPORT void flushAllDeletedGLObjects(unsigned int contextID);
/** Do a GL delete all OpenGL objects.
* Note, must be called from a thread which has current the graphics context
associated with contextID. */
extern OSG_EXPORT void deleteAllGLObjects(unsigned int contextID);
/** Discard all OpenGL objects.
* Note, unlike deleteAllObjectObjects discard does not
* do any OpenGL calls so can be called from any thread, but as a consequence
it
* also doesn't remove the associated OpenGL resource so discard should only be
* called when the associated graphics context is being/has been closed. */
extern OSG_EXPORT void discardAllGLObjects(unsigned int contextID);
}
#endif
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
