Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed build

  • Loading branch information...
commit 7d5aa13d648c2c546ca0804359c1c4b65b3ee1b6 1 parent b58f968
Robert OSFIELD authored
Showing with 4 additions and 12 deletions.
  1. +4 −12 applications/osgviewer/osgviewer.cpp
16 applications/osgviewer/osgviewer.cpp
View
@@ -94,7 +94,7 @@ class MySwapBuffersCallback : public osg::GraphicsContext::SwapCallback
if (_previousSync)
{
unsigned int num_seconds = 1;
- GLuint64 timeout = num_seconds * ((GLuint64)1000 * 1000 * 1000);
+ GLuint64EXT timeout = num_seconds * ((GLuint64EXT)1000 * 1000 * 1000);
_glClientWaitSync(_previousSync, 0, timeout);
_glDeleteSync(_previousSync);
@@ -107,22 +107,14 @@ class MySwapBuffersCallback : public osg::GraphicsContext::SwapCallback
//OSG_NOTICE<<"After swap"<<std::endl;
}
- #ifdef _WIN32
- typedef __int64 GLint64;
- typedef unsigned __int64 GLuint64;
- #else
- typedef int64_t GLint64;
- typedef uint64_t GLuint64;
- #endif
-
typedef struct __GLsync *GLsync;
typedef GLsync (GL_APIENTRY * PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
typedef GLboolean (GL_APIENTRY * PFNGLISSYNCPROC) (GLsync sync);
typedef void (GL_APIENTRY * PFNGLDELETESYNCPROC) (GLsync sync);
- typedef GLenum (GL_APIENTRY * PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
- typedef void (GL_APIENTRY * PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
- typedef void (GL_APIENTRY * PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
+ typedef GLenum (GL_APIENTRY * PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64EXT timeout);
+ typedef void (GL_APIENTRY * PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64EXT timeout);
+ typedef void (GL_APIENTRY * PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64EXT *params);
typedef void (GL_APIENTRY * PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
bool _extensionInitialized;
Please sign in to comment.
Something went wrong with that request. Please try again.