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

From svn/trunk merged automatic detection of GLint64 + GLuint64 in GL headers

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15003 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-07-22 14:27:36 +00:00
parent 6e65a9955e
commit 8e20224828
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osg/GL.in
View File

@@ -36,6 +36,8 @@
#define OSG_GLES1_FEATURES @OSG_GLES1_FEATURES@
#define OSG_GLES2_FEATURES @OSG_GLES2_FEATURES@
#define OSG_GLES3_FEATURES @OSG_GLES3_FEATURES@
#define GL_HEADER_HAS_GLINT64 @GL_HEADER_HAS_GLINT64@
#define GL_HEADER_HAS_GLUINT64 @GL_HEADER_HAS_GLUINT64@
#ifndef WIN32
@@ -115,12 +117,18 @@
#endif // GL_APIENTRY
#if !defined(GL_VERSION_3_1)
#if !GL_HEADER_HAS_GLINT64
#ifdef _WIN32
typedef __int64 GLint64;
typedef unsigned __int64 GLuint64;
typedef __int64 GLint64;
#else
typedef long long int GLint64;
#endif
#endif
#if !GL_HEADER_HAS_GLUINT64
#ifdef _WIN32
typedef unsigned __int64 GLuint64;
#else
typedef unsigned long long int GLuint64;
#endif
#endif