Show
Ignore:
Timestamp:
04/23/14 11:08:26 (7 hours ago)
Author:
robert
Message:

Introduced new scheme for setting up which version of OpenGL/OpenGL ES the OSG is compiled for.

To select standard OpenGL 1/2 build with full backwards and forwards comtability use:

./configure
make

OR

./configure -DOPENGL_PROFILE=GL2

To select OpenGL 3 core profile build using GL3/gl3.h header:

./configure -DOPENGL_PROFILE=GL3

To select OpenGL Arb core profile build using GL/glcorearb.h header:

./configure -DOPENGL_PROFILE=GLCORE

To select OpenGL ES 1.1 profile use:

./configure -DOPENGL_PROFILE=GLES1

To select OpenGL ES 2 profile use:

./configure -DOPENGL_PROFILE=GLES2

Using OPENGL_PROFILE will select all the appropriate features required so no other settings in cmake will need to be adjusted.
The new configuration options are stored in the include/osg/OpenGL header that deprecates the old include/osg/GL header.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/ive/DataOutputStream.cpp

    r13502 r13557  
    508508} 
    509509 
    510 void DataOutputStream::writeBinding(osg::Geometry::AttributeBinding b){ 
     510void DataOutputStream::writeBinding(deprecated_osg::Geometry::AttributeBinding b){ 
    511511    switch(b){ 
    512         case osg::Geometry::BIND_OFF:                           writeChar((char) 0); break; 
    513         case osg::Geometry::BIND_OVERALL:                       writeChar((char) 1); break; 
    514         case static_cast<osg::Geometry::AttributeBinding>(3):   writeChar((char) 2); break;  /*osg::Geometry::BIND_PER_PRIMITIVE*/ 
    515         case osg::Geometry::BIND_PER_PRIMITIVE_SET:             writeChar((char) 3); break; 
    516         case osg::Geometry::BIND_PER_VERTEX:                    writeChar((char) 4); break; 
     512        case deprecated_osg::Geometry::BIND_OFF:                           writeChar((char) 0); break; 
     513        case deprecated_osg::Geometry::BIND_OVERALL:                       writeChar((char) 1); break; 
     514        case deprecated_osg::Geometry::BIND_PER_PRIMITIVE:                 writeChar((char) 2); break; 
     515        case deprecated_osg::Geometry::BIND_PER_PRIMITIVE_SET:             writeChar((char) 3); break; 
     516        case deprecated_osg::Geometry::BIND_PER_VERTEX:                    writeChar((char) 4); break; 
    517517        default: throwException("Unknown binding in DataOutputStream::writeBinding()"); 
    518518    }