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

From Stephan Huber, "recent commits regarding GLuint64EXT broke the build for GLES1 and GLES2. Attached you’ll find a fix which hopefully work for every platform."

Browse Source
This commit is contained in:
Robert Osfield
2014-01-20 15:10:49 +00:00
parent 15399bbf35
commit 5cb305041d
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/osg/GL
View File

@@ -131,17 +131,7 @@
#endif #endif
#endif #endif
#if !defined(GL_EXT_timer_query) #endif
#ifdef _WIN32
typedef __int64 GLint64EXT;
typedef unsigned __int64 GLuint64EXT;
#else
typedef long long int GLint64EXT;
typedef unsigned long long int GLuint64EXT;
#endif
#endif
#endif
#ifndef GL_APIENTRY #ifndef GL_APIENTRY
#define GL_APIENTRY APIENTRY #define GL_APIENTRY APIENTRY
@@ -150,6 +140,17 @@
#endif #endif
#if !defined(GL_EXT_timer_query) && !defined(OSG_GL3_AVAILABLE)
#ifdef _WIN32
typedef __int64 GLint64EXT;
typedef unsigned __int64 GLuint64EXT;
#else
typedef long long int GLint64EXT;
typedef unsigned long long int GLuint64EXT;
#endif
#endif
#ifdef OSG_GL_MATRICES_AVAILABLE #ifdef OSG_GL_MATRICES_AVAILABLE
inline void glLoadMatrix(const float* mat) { glLoadMatrixf(static_cast<const GLfloat*>(mat)); } inline void glLoadMatrix(const float* mat) { glLoadMatrixf(static_cast<const GLfloat*>(mat)); }