Changeset 13041 for OpenSceneGraph/trunk/src/osg/VertexProgram.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osg/VertexProgram.cpp (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osg/VertexProgram.cpp
r11881 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 5 5 * (at your option) any later version. The full license is in LICENSE file 6 6 * included with this distribution, and on the openscenegraph.org website. 7 * 7 * 8 8 * This library is distributed in the hope that it will be useful, 9 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 11 * OpenSceneGraph Public License for more details. 12 12 */ … … 24 24 using namespace osg; 25 25 26 // static cache of deleted vertex programs which can only 26 // static cache of deleted vertex programs which can only 27 27 // by completely deleted once the appropriate OpenGL context 28 28 // is set. … … 70 70 } 71 71 } 72 72 73 73 availableTime -= elapsedTime; 74 74 } … … 92 92 _vertexProgram = vp._vertexProgram; 93 93 94 for( LocalParamList::const_iterator itr = vp._programLocalParameters.begin(); 94 for( LocalParamList::const_iterator itr = vp._programLocalParameters.begin(); 95 95 itr != vp._programLocalParameters.end(); ++itr ) 96 96 { … … 98 98 } 99 99 100 for( MatrixList::const_iterator mitr = vp._matrixList.begin(); 100 for( MatrixList::const_iterator mitr = vp._matrixList.begin(); 101 101 mitr != vp._matrixList.end(); ++mitr ) 102 102 { … … 279 279 { 280 280 OSG_WARN<<"Error: glBindProgram not supported by OpenGL driver"<<std::endl; 281 } 281 } 282 282 } 283 283 … … 310 310 if (_glProgramString) 311 311 { 312 _glProgramString(target,format, len, string); 312 _glProgramString(target,format, len, string); 313 313 } 314 314 else
