FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Traits::getContextVersion(uint,uint)

Browse Source
This commit is contained in:
Robert Osfield
2012-03-21 11:36:54 +00:00
parent cee53f6adc
commit c3a0a8ddc3
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/GraphicsContext
View File

@@ -123,7 +123,9 @@ class OSG_EXPORT GraphicsContext : public Object
std::string glContextVersion;
unsigned int glContextFlags;
unsigned int glContextProfileMask;
/** return true if glContextVersion is set in the form major.minor, and assign the appropriate major and minor values to the associated parameters.*/
bool getContextVersion(unsigned int& major, unsigned int& minor) const;
// shared context
GraphicsContext* sharedContext;

12
src/osg/GraphicsContext.cpp
View File

@@ -217,6 +217,18 @@ GraphicsContext::Traits::Traits(DisplaySettings* ds):
}
}
bool GraphicsContext::Traits::getContextVersion(unsigned int& major, unsigned int& minor) const
{
if (glContextVersion.empty()) return false;
std::istringstream istr( glContextVersion );
unsigned char dot;
istr >> major >> dot >> minor;
return true;
}
class ContextData
{
public:

7
src/osgViewer/GraphicsWindowWin32.cpp
View File

@@ -1766,11 +1766,8 @@ HGLRC GraphicsWindowWin32::createContextImplementation()
unsigned int idx( 0 );
int attribs[ 16 ];
std::istringstream istr( _traits->glContextVersion );
unsigned int major, minor;
unsigned char dot;
istr >> major >> dot >> minor;
if( major < 3 )
unsigned int major = 1, minor = 0;
if( !_traitrs->getContextVersion(major, minor) || major<3 )
{
OSG_NOTIFY( osg::WARN ) << "GL3: Non-GL3 version number: " << _traits->glContextVersion << std::endl;
}