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

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield 2016-06-25 17:19:00 +01:00
parent 45555c895d
commit 40ccf503e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osggpucull/DrawIndirectPrimitiveSet.cpp
View File

@ -34,7 +34,7 @@ void DrawArraysIndirect::draw(osg::State& state, bool /*useVertexBufferObjects*/
} }
void MultiDrawArraysIndirect::draw(osg::State& state, bool useVertexBufferObjects) const void MultiDrawArraysIndirect::draw(osg::State& state, bool /*useVertexBufferObjects*/) const
{ {
// DrawIndirectGLExtensions *ext = DrawIndirectGLExtensions::getExtensions( state.getContextID(),true ); // DrawIndirectGLExtensions *ext = DrawIndirectGLExtensions::getExtensions( state.getContextID(),true );
state.get<osg::GLExtensions>()->glMultiDrawArraysIndirect( _mode, reinterpret_cast<const void*>(_indirect), _drawcount, _stride ); state.get<osg::GLExtensions>()->glMultiDrawArraysIndirect( _mode, reinterpret_cast<const void*>(_indirect), _drawcount, _stride );

2
include/osgAnimation/Channel
View File

@ -81,7 +81,7 @@ namespace osgAnimation
typedef TemplateKeyframeContainer<typename SamplerType::KeyframeType> KeyframeContainerType; typedef TemplateKeyframeContainer<typename SamplerType::KeyframeType> KeyframeContainerType;
Object* cloneType() const { return new TemplateChannel(); } Object* cloneType() const { return new TemplateChannel(); }
Object* clone(const osg::CopyOp& copyop) const { return new TemplateChannel<SamplerType>(*this); } Object* clone(const osg::CopyOp&) const { return new TemplateChannel<SamplerType>(*this); }
Channel* clone() const { return new TemplateChannel<SamplerType>(*this); } Channel* clone() const { return new TemplateChannel<SamplerType>(*this); }
TemplateChannel (const TemplateChannel& channel) : TemplateChannel (const TemplateChannel& channel) :