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

Renamed CMake variable + C++ #define to OSG_GL_CONTEXT_VERSION

Browse Source
This commit is contained in:
Robert Osfield
2018-04-24 17:05:03 +01:00
parent 1aa0a80de7
commit 2b3ac015bb
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/DisplaySettings.cpp
View File

@@ -240,7 +240,7 @@ void DisplaySettings::setDefaults()
_implicitBufferAttachmentRenderMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
_implicitBufferAttachmentResolveMask = DEFAULT_IMPLICIT_BUFFER_ATTACHMENT;
_glContextVersion = OSG_GL_CONTEXT_STRING;
_glContextVersion = OSG_GL_CONTEXT_VERSION;
_glContextFlags = 0;
_glContextProfileMask = 0;

2
src/osg/GL.in
View File

@@ -39,7 +39,7 @@
#define OSG_GLES1_FEATURES @OSG_GLES1_FEATURES@
#define OSG_GLES2_FEATURES @OSG_GLES2_FEATURES@
#define OSG_GLES3_FEATURES @OSG_GLES3_FEATURES@
#define OSG_GL_CONTEXT_STRING "@OSG_GL_CONTEXT_STRING@"
#define OSG_GL_CONTEXT_VERSION "@OSG_GL_CONTEXT_VERSION@"
#ifndef WIN32

2
src/osg/GraphicsContext.cpp
View File

@@ -239,7 +239,7 @@ GraphicsContext::Traits::Traits(DisplaySettings* ds):
swapBarrier(0),
useMultiThreadedOpenGLEngine(false),
useCursor(true),
glContextVersion(OSG_GL_CONTEXT_STRING),
glContextVersion(OSG_GL_CONTEXT_VERSION),
glContextFlags(0),
glContextProfileMask(0),
sharedContext(0),