Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

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 
    22 * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. 
    33 * Copyright (C) 2004-2005 Nathan Cournia 
     
    55 * Copyright (C) 2010 VIRES Simulationstechnologie GmbH 
    66 * 
    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 
    88 * freely and without restriction, both in commercial and non commercial 
    99 * applications, as long as this copyright notice is maintained. 
    10  *  
     10 * 
    1111 * This application is distributed in the hope that it will be useful, 
    1212 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     
    184184    // used by the COMPARE_StateAttribute_Parameter macros below. 
    185185    COMPARE_StateAttribute_Types(Program,sa) 
    186      
     186 
    187187    if( _shaderList.size() < rhs._shaderList.size() ) return -1; 
    188188    if( rhs._shaderList.size() < _shaderList.size() ) return 1; 
     
    273273        unsigned int contextID = state->getContextID(); 
    274274        _pcpList[contextID] = 0; 
    275     }    
     275    } 
    276276} 
    277277 
     
    390390        case GL_GEOMETRY_INPUT_TYPE_EXT:   return _geometryInputType; 
    391391        case GL_GEOMETRY_OUTPUT_TYPE_EXT:  return _geometryOutputType; 
    392         case GL_PATCH_VERTICES:            return _patchVertices;  
     392        case GL_PATCH_VERTICES:            return _patchVertices; 
    393393    } 
    394394    OSG_WARN << "getParameter invalid param " << pname << std::endl; 
     
    652652        if( getInfoLog(infoLog) ) 
    653653        { 
    654             OSG_WARN << "Program \""<< _program->getName() << "\" "  
     654            OSG_WARN << "Program \""<< _program->getName() << "\" " 
    655655                                      "infolog:\n" << infoLog << std::endl; 
    656656        } 
    657          
     657 
    658658        return; 
    659659    } 
     
    746746 
    747747            GLint loc = _extensions->glGetUniformLocation( _glProgramHandle, name ); 
    748              
     748 
    749749            if( loc != -1 ) 
    750750            { 
     
    777777 
    778778            GLint loc = _extensions->glGetAttribLocation( _glProgramHandle, name ); 
    779              
     779 
    780780            if( loc != -1 ) 
    781781            { 
     
    811811 
    812812    OSG_WARN << std::endl; 
    813      
     813 
    814814    return false; 
    815815}