Changeset 13041 for OpenSceneGraph/trunk/src/osg/Program.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
-
OpenSceneGraph/trunk/src/osg/Program.cpp (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osg/Program.cpp
r12816 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 2 2 * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. 3 3 * Copyright (C) 2004-2005 Nathan Cournia … … 5 5 * Copyright (C) 2010 VIRES Simulationstechnologie GmbH 6 6 * 7 * This application is open source and may be redistributed and/or modified 7 * This application is open source and may be redistributed and/or modified 8 8 * freely and without restriction, both in commercial and non commercial 9 9 * applications, as long as this copyright notice is maintained. 10 * 10 * 11 11 * This application is distributed in the hope that it will be useful, 12 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of … … 184 184 // used by the COMPARE_StateAttribute_Parameter macros below. 185 185 COMPARE_StateAttribute_Types(Program,sa) 186 186 187 187 if( _shaderList.size() < rhs._shaderList.size() ) return -1; 188 188 if( rhs._shaderList.size() < _shaderList.size() ) return 1; … … 273 273 unsigned int contextID = state->getContextID(); 274 274 _pcpList[contextID] = 0; 275 } 275 } 276 276 } 277 277 … … 390 390 case GL_GEOMETRY_INPUT_TYPE_EXT: return _geometryInputType; 391 391 case GL_GEOMETRY_OUTPUT_TYPE_EXT: return _geometryOutputType; 392 case GL_PATCH_VERTICES: return _patchVertices; 392 case GL_PATCH_VERTICES: return _patchVertices; 393 393 } 394 394 OSG_WARN << "getParameter invalid param " << pname << std::endl; … … 652 652 if( getInfoLog(infoLog) ) 653 653 { 654 OSG_WARN << "Program \""<< _program->getName() << "\" " 654 OSG_WARN << "Program \""<< _program->getName() << "\" " 655 655 "infolog:\n" << infoLog << std::endl; 656 656 } 657 657 658 658 return; 659 659 } … … 746 746 747 747 GLint loc = _extensions->glGetUniformLocation( _glProgramHandle, name ); 748 748 749 749 if( loc != -1 ) 750 750 { … … 777 777 778 778 GLint loc = _extensions->glGetAttribLocation( _glProgramHandle, name ); 779 779 780 780 if( loc != -1 ) 781 781 { … … 811 811 812 812 OSG_WARN << std::endl; 813 813 814 814 return false; 815 815 }
