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

Convert NOTIFY to OSG_NOTIFY to avoid problems with polution of users apps with the NOTIFY macro

Browse Source
This commit is contained in:
Robert Osfield
2010-02-10 12:44:59 +00:00
parent 6ab51c7c47
commit f17e401347
42 changed files with 884 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/GL2Extensions.cpp
View File

@@ -322,7 +322,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
const char* version = (const char*) glGetString( GL_VERSION );
if (!version)
{
NOTIFY(osg::FATAL)<<"Error: OpenGL version test failed, requires valid graphics context."<<std::endl;
OSG_NOTIFY(osg::FATAL)<<"Error: OpenGL version test failed, requires valid graphics context."<<std::endl;
return;
}
@@ -349,7 +349,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
_glslLanguageVersion = 1.0f;
}
NOTIFY(osg::INFO)
OSG_NOTIFY(osg::INFO)
<< "glVersion=" << getGlVersion() << ", "
<< "isGlslSupported=" << (isGlslSupported() ? "YES" : "NO") << ", "
<< "glslLanguageVersion=" << getLanguageVersion()
@@ -519,7 +519,7 @@ void GL2Extensions::Set(unsigned int contextID, GL2Extensions* extensions)
static void NotSupported( const char* funcName )
{
NOTIFY(osg::WARN)
OSG_NOTIFY(osg::WARN)
<<"Error: "<<funcName<<" not supported by OpenGL driver"<<std::endl;
}