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

Merge pull request #537 from openscenegraph/revert-536-default-gl3-context

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

4
src/osg/DisplaySettings.cpp
View File

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

4
src/osg/GraphicsContext.cpp
View File

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