Changeset 10740 for OpenSceneGraph/trunk/include/osg/DisplaySettings

Timestamp:

11/11/09 16:25:42 (4 years ago)

Author:

robert

Message:

Added glContexVersion, glContextFlags and glContextProfileMask members to osg::GraphicsContext::Traits to support GL3 graphics context creation.

Moved the handling of DisplaySettings? into Traits constructor.

Added support for s/getGLContextVersion(), s/getGLContextFlags() and s/getGLContextProfileMask() to osg::DisplaySettings?.

Added command line and env var support for setting the GLContextVersion, GLContextFlags and GLContextProfileMask to osg::DisplaySettings?.

Files:

• OpenSceneGraph/trunk/include/osg/DisplaySettings (modified) (2 diffs)

OpenSceneGraph/trunk/include/osg/DisplaySettings

@@ -206 +206 @@
         void setMaxBufferObjectPoolSize(unsigned int size) { _maxBufferObjectPoolSize = size; }
         unsigned int getMaxBufferObjectPoolSize() const { return _maxBufferObjectPoolSize; }
+
+        /** Set the hint of which OpenGL version to attempt to create a graphics context for.*/
+        void setGLContextVersion(const std::string& version) { _glContextVersion = version; }
+
+        /** Get the hint of which OpenGL version to attempt to create a graphics context for.*/
+        const std::string getGLContextVersion() const { return _glContextVersion; }
+
+        /** Set the hint of the flags to use in when creating graphic contexts.*/
+        void setGLContextFlags(unsigned int flags) { _glContextFlags = flags; }
+
+        /** Get the hint of the flags to use in when creating graphic contexts.*/
+        unsigned int getGLContextFlags() const { return _glContextFlags; }
+        
+        /** Set the hint of the profile mask to use in when creating graphic contexts.*/
+        void setGLContextProfileMask(unsigned int mask) { _glContextProfileMask = mask; }
+
+        /** Get the hint of the profile mask to use in when creating graphic contexts.*/
+        unsigned int getGLContextProfileMask() const { return _glContextProfileMask; }
 
     protected:
@@ -250 +268 @@
         unsigned int                    _maxTexturePoolSize;
         unsigned int                    _maxBufferObjectPoolSize;
+        
+        std::string                     _glContextVersion;
+        unsigned int                    _glContextFlags;
+        unsigned int                    _glContextProfileMask;
 };