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

Added OSG_GL_CONTEXT_STRING cmake variable to set include/osg/GL headers that sets Traits::glContextVersion.

Browse Source
This commit is contained in:
Robert Osfield 2018-04-24 16:22:13 +01:00
parent 4dd1156444
commit 1aa0a80de7
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -556,9 +556,13 @@ ELSE()
OPTION(OSG_CPP_EXCEPTIONS_AVAILABLE "Set to OFF to disable compile of OSG components that use C++ exceptions." ON) OPTION(OSG_CPP_EXCEPTIONS_AVAILABLE "Set to OFF to disable compile of OSG components that use C++ exceptions." ON)
ENDIF() ENDIF()
SET(OSG_GL_CONTEXT_STRING "1.0" CACHE STRING "GL Context String to pass when creaing graphics contexts")
# Map the OSG_GL*_AVAILABLE settings to OpenGL header settings # Map the OSG_GL*_AVAILABLE settings to OpenGL header settings
IF (OSG_GL3_AVAILABLE) IF (OSG_GL3_AVAILABLE)
SET(OSG_GL_CONTEXT_STRING "3.3")
IF (APPLE) IF (APPLE)
SET(OPENGL_HEADER1 "#include <OpenGL/gl.h>" CACHE STRING "#include<> line for OpenGL Header") SET(OPENGL_HEADER1 "#include <OpenGL/gl.h>" CACHE STRING "#include<> line for OpenGL Header")
SET(OPENGL_HEADER2 "#include <OpenGL/gl3.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required") SET(OPENGL_HEADER2 "#include <OpenGL/gl3.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required")

2
src/osg/DisplaySettings.cpp
View File

@ -240,7 +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;
_glContextVersion = "1.0"; _glContextVersion = OSG_GL_CONTEXT_STRING;
_glContextFlags = 0; _glContextFlags = 0;
_glContextProfileMask = 0; _glContextProfileMask = 0;

1
src/osg/GL.in
View File

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

2
src/osg/GraphicsContext.cpp
View File

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