From f3575e6a4016c470545e4627bc62b8248dac9c5a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 3 Feb 2010 09:35:05 +0000 Subject: [PATCH] Added #defines for GL3 build --- include/osg/Fog | 4 ++++ include/osg/Point | 4 ++++ src/osgWrappers/serializers/osg/Camera.cpp | 4 ++++ src/osgWrappers/serializers/osg/ClearNode.cpp | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/include/osg/Fog b/include/osg/Fog index 91601fbd1..1b9400735 100644 --- a/include/osg/Fog +++ b/include/osg/Fog @@ -30,6 +30,10 @@ #define GL_EXP2 0x0801 #endif +#ifndef GL_FOG_HINT + #define GL_FOG_HINT 0x0C54 +#endif + namespace osg { diff --git a/include/osg/Point b/include/osg/Point index dcddc40a8..115fdae1a 100644 --- a/include/osg/Point +++ b/include/osg/Point @@ -21,6 +21,10 @@ #define GL_POINT_SMOOTH 0x0B10 #endif +#ifndef GL_POINT_SMOOTH_HINT + #define GL_POINT_SMOOTH_HINT 0x0C51 +#endif + namespace osg { /** Point - encapsulates the OpenGL point smoothing and size state.*/ diff --git a/src/osgWrappers/serializers/osg/Camera.cpp b/src/osgWrappers/serializers/osg/Camera.cpp index b55b28924..0fc20d3c8 100644 --- a/src/osgWrappers/serializers/osg/Camera.cpp +++ b/src/osgWrappers/serializers/osg/Camera.cpp @@ -3,6 +3,10 @@ #include #include +#ifndef GL_ACCUM_BUFFER_BIT + #define GL_ACCUM_BUFFER_BIT 0x00000200 +#endif + BEGIN_USER_TABLE( RenderOrder, osg::Camera ); ADD_USER_VALUE( PRE_RENDER ); ADD_USER_VALUE( NESTED_RENDER ); diff --git a/src/osgWrappers/serializers/osg/ClearNode.cpp b/src/osgWrappers/serializers/osg/ClearNode.cpp index 08da79bb5..9762046e9 100644 --- a/src/osgWrappers/serializers/osg/ClearNode.cpp +++ b/src/osgWrappers/serializers/osg/ClearNode.cpp @@ -3,6 +3,10 @@ #include #include +#ifndef GL_ACCUM_BUFFER_BIT + #define GL_ACCUM_BUFFER_BIT 0x00000200 +#endif + // _clearMask static bool checkClearMask( const osg::ClearNode& node ) {