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

Restructed the GLExtensions(..) constructor so that it now intializes all the variables to NULL if there is not a valid graphics context present

Browse Source
This commit is contained in:
Robert Osfield
2016-06-23 12:19:59 +01:00
parent bc8452512f
commit 1f73376476
2 changed files with 384 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osg/GLExtensions
View File

@@ -106,21 +106,21 @@ T convertPointerType(R src)
}
template<typename T>
bool setGLExtensionFuncPtr(T& t, const char* str1)
bool setGLExtensionFuncPtr(T& t, const char* str1, bool validContext=true)
{
return convertPointer(t, osg::getGLExtensionFuncPtr(str1));
return convertPointer(t, validContext ? osg::getGLExtensionFuncPtr(str1) : 0);
}
template<typename T>
bool setGLExtensionFuncPtr(T& t, const char* str1, const char* str2)
bool setGLExtensionFuncPtr(T& t, const char* str1, const char* str2, bool validContext=true)
{
return convertPointer(t, osg::getGLExtensionFuncPtr(str1, str2));
return convertPointer(t, validContext ? osg::getGLExtensionFuncPtr(str1, str2) : 0);
}
template<typename T>
bool setGLExtensionFuncPtr(T& t, const char* str1, const char* str2, const char* str3)
bool setGLExtensionFuncPtr(T& t, const char* str1, const char* str2, const char* str3, bool validContext=true)
{
return convertPointer(t, osg::getGLExtensionFuncPtr(str1, str2, str3));
return convertPointer(t, validContext ? osg::getGLExtensionFuncPtr(str1, str2, str3) : 0);
}
/** Main GLExtensions class for managing OpenGL extensions per graphics context.*/