From 61782d8f29f824621bd0786532e51c5b0fb0313b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 11 Mar 2017 12:31:19 +0000 Subject: [PATCH] Build fixes --- include/osg/GLDefines | 4 ---- include/osg/GLExtensions | 10 +++++----- include/osgDB/StreamOperator | 4 ++-- src/osgDB/ClassInterface.cpp | 4 ++-- src/osgPlugins/osg/AsciiStreamOperator.h | 4 ++-- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/include/osg/GLDefines b/include/osg/GLDefines index b5442820d..bebce6656 100644 --- a/include/osg/GLDefines +++ b/include/osg/GLDefines @@ -660,10 +660,6 @@ typedef char GLchar; #define GL_ALPHA_TEST 0x0BC0 #endif -#ifndef GLuint64EXT - typedef uint64_t GLuint64EXT; -#endif - namespace osg { #ifndef GL_VERSION_3_2 diff --git a/include/osg/GLExtensions b/include/osg/GLExtensions index 3309660df..c9c2f3203 100644 --- a/include/osg/GLExtensions +++ b/include/osg/GLExtensions @@ -364,11 +364,11 @@ class OSG_EXPORT GLExtensions : public osg::Referenced void (GL_APIENTRY * glUniformMatrix4x3dv)( GLint location, GLsizei count, GLboolean transpose, const GLdouble* value ); void (GL_APIENTRY * glGetActiveAtomicCounterBufferiv)( GLuint program, GLuint bufferIndex, GLenum pname, GLint* params ); void (GL_APIENTRY * glDispatchCompute)( GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ ); - GLuint64EXT (GL_APIENTRY* glGetTextureHandle)(GLint texture); - void (GL_APIENTRY* glMakeTextureHandleResident)(GLuint64EXT handle); - void (GL_APIENTRY* glMakeTextureHandleNonResident)(GLuint64EXT handle); - void (GL_APIENTRY* glUniformHandleui64)(GLint location, GLuint64EXT handle); - GLboolean (GL_APIENTRY* glIsTextureHandleResident)(GLuint64EXT handle); + GLuint64 (GL_APIENTRY* glGetTextureHandle)(GLint texture); + void (GL_APIENTRY* glMakeTextureHandleResident)(GLuint64 handle); + void (GL_APIENTRY* glMakeTextureHandleNonResident)(GLuint64 handle); + void (GL_APIENTRY* glUniformHandleui64)(GLint location, GLuint64 handle); + GLboolean (GL_APIENTRY* glIsTextureHandleResident)(GLuint64 handle); // Buffer Object extensions bool isBufferObjectSupported; diff --git a/include/osgDB/StreamOperator b/include/osgDB/StreamOperator index 6b29e29dd..e317cae09 100644 --- a/include/osgDB/StreamOperator +++ b/include/osgDB/StreamOperator @@ -37,8 +37,8 @@ public: virtual void writeUInt( unsigned int i ) = 0; virtual void writeLong( long l ) = 0; virtual void writeULong( unsigned long l ) = 0; - virtual void writeInt64( int64_t ll ) = 0; - virtual void writeUInt64( uint64_t ull ) = 0; + virtual void writeInt64( GLint64 ll ) = 0; + virtual void writeUInt64( GLuint64 ull ) = 0; virtual void writeFloat( float f ) = 0; virtual void writeDouble( double d ) = 0; virtual void writeString( const std::string& s ) = 0; diff --git a/src/osgDB/ClassInterface.cpp b/src/osgDB/ClassInterface.cpp index f2c7c0b8b..e347483b0 100644 --- a/src/osgDB/ClassInterface.cpp +++ b/src/osgDB/ClassInterface.cpp @@ -58,8 +58,8 @@ public: virtual void writeULong( unsigned long l ) { write(l); } virtual void writeFloat( float f ) { write(f); } virtual void writeDouble( double d ) { write(d); } - virtual void writeInt64( long long ll ) { write(ll); } - virtual void writeUInt64( unsigned long long ull ) { write(ull); } + virtual void writeInt64( GLint64 ll ) { write(ll); } + virtual void writeUInt64( GLuint64 ull ) { write(ull); } virtual void writeString( const std::string& s ) { _str.insert(_str.end(), s.begin(), s.end()); } virtual void writeStream( std::ostream& (*)(std::ostream&) ) {} virtual void writeBase( std::ios_base& (*)(std::ios_base&) ) {} diff --git a/src/osgPlugins/osg/AsciiStreamOperator.h b/src/osgPlugins/osg/AsciiStreamOperator.h index 0097d575c..bffe5ced4 100644 --- a/src/osgPlugins/osg/AsciiStreamOperator.h +++ b/src/osgPlugins/osg/AsciiStreamOperator.h @@ -49,10 +49,10 @@ public: virtual void writeULong( unsigned long l ) { indentIfRequired(); *_out << l << ' '; } - virtual void writeInt64( long long ll ) + virtual void writeInt64( GLint64 ll ) { indentIfRequired(); *_out << ll << ' '; } - virtual void writeUInt64( unsigned long long ull ) + virtual void writeUInt64( GLuint64 ull ) { indentIfRequired(); *_out << ull << ' '; } virtual void writeFloat( float f )