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

Merge pull request #536 from emminizer/default-gl3-context

Browse Source 
When GL3 build is enabled, default context requested is version 3.3, …
This commit is contained in:
OpenSceneGraph git repository 2018-04-24 15:36:11 +01:00 committed by GitHub
commit e8c0033f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/DisplaySettings.cpp
View File

@ -240,7 +240,11 @@ void DisplaySettings::setDefaults()
_implicitBufferAttachmentRenderMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
_implicitBufferAttachmentResolveMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
#ifdef OSG_GL3_FEATURES
_glContextVersion = "3.3";
#else
_glContextVersion = "1.0";
#endif
_glContextFlags = 0;
_glContextProfileMask = 0;

4
src/osg/GraphicsContext.cpp
View File

@ -239,7 +239,11 @@ GraphicsContext::Traits::Traits(DisplaySettings* ds):
swapBarrier(0),
useMultiThreadedOpenGLEngine(false),
useCursor(true),
#ifdef OSG_GL3_FEATURES
glContextVersion("3.3"),
#else
glContextVersion("1.0"),
#endif
glContextFlags(0),
glContextProfileMask(0),
sharedContext(0),