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

Build fixes

Browse Source
This commit is contained in:
Robert Osfield 2017-03-11 12:31:19 +00:00
parent 75e4d85681
commit 61782d8f29
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/GLDefines
View File

@ -660,10 +660,6 @@ typedef char GLchar;
#define GL_ALPHA_TEST 0x0BC0 #define GL_ALPHA_TEST 0x0BC0
#endif #endif
#ifndef GLuint64EXT
typedef uint64_t GLuint64EXT;
#endif
namespace osg namespace osg
{ {
#ifndef GL_VERSION_3_2 #ifndef GL_VERSION_3_2

10
include/osg/GLExtensions
View File

@ -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 * 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 * glGetActiveAtomicCounterBufferiv)( GLuint program, GLuint bufferIndex, GLenum pname, GLint* params );
void (GL_APIENTRY * glDispatchCompute)( GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ ); void (GL_APIENTRY * glDispatchCompute)( GLuint numGroupsX, GLuint numGroupsY, GLuint numGroupsZ );
GLuint64EXT (GL_APIENTRY* glGetTextureHandle)(GLint texture); GLuint64 (GL_APIENTRY* glGetTextureHandle)(GLint texture);
void (GL_APIENTRY* glMakeTextureHandleResident)(GLuint64EXT handle); void (GL_APIENTRY* glMakeTextureHandleResident)(GLuint64 handle);
void (GL_APIENTRY* glMakeTextureHandleNonResident)(GLuint64EXT handle); void (GL_APIENTRY* glMakeTextureHandleNonResident)(GLuint64 handle);
void (GL_APIENTRY* glUniformHandleui64)(GLint location, GLuint64EXT handle); void (GL_APIENTRY* glUniformHandleui64)(GLint location, GLuint64 handle);
GLboolean (GL_APIENTRY* glIsTextureHandleResident)(GLuint64EXT handle); GLboolean (GL_APIENTRY* glIsTextureHandleResident)(GLuint64 handle);
// Buffer Object extensions // Buffer Object extensions
bool isBufferObjectSupported; bool isBufferObjectSupported;

4
include/osgDB/StreamOperator
View File

@ -37,8 +37,8 @@ public:
virtual void writeUInt( unsigned int i ) = 0; virtual void writeUInt( unsigned int i ) = 0;
virtual void writeLong( long l ) = 0; virtual void writeLong( long l ) = 0;
virtual void writeULong( unsigned long l ) = 0; virtual void writeULong( unsigned long l ) = 0;
virtual void writeInt64( int64_t ll ) = 0; virtual void writeInt64( GLint64 ll ) = 0;
virtual void writeUInt64( uint64_t ull ) = 0; virtual void writeUInt64( GLuint64 ull ) = 0;
virtual void writeFloat( float f ) = 0; virtual void writeFloat( float f ) = 0;
virtual void writeDouble( double d ) = 0; virtual void writeDouble( double d ) = 0;
virtual void writeString( const std::string& s ) = 0; virtual void writeString( const std::string& s ) = 0;

4
src/osgDB/ClassInterface.cpp
View File

@ -58,8 +58,8 @@ public:
virtual void writeULong( unsigned long l ) { write(l); } virtual void writeULong( unsigned long l ) { write(l); }
virtual void writeFloat( float f ) { write(f); } virtual void writeFloat( float f ) { write(f); }
virtual void writeDouble( double d ) { write(d); } virtual void writeDouble( double d ) { write(d); }
virtual void writeInt64( long long ll ) { write(ll); } virtual void writeInt64( GLint64 ll ) { write(ll); }
virtual void writeUInt64( unsigned long long ull ) { write(ull); } virtual void writeUInt64( GLuint64 ull ) { write(ull); }
virtual void writeString( const std::string& s ) { _str.insert(_str.end(), s.begin(), s.end()); } virtual void writeString( const std::string& s ) { _str.insert(_str.end(), s.begin(), s.end()); }
virtual void writeStream( std::ostream& (*)(std::ostream&) ) {} virtual void writeStream( std::ostream& (*)(std::ostream&) ) {}
virtual void writeBase( std::ios_base& (*)(std::ios_base&) ) {} virtual void writeBase( std::ios_base& (*)(std::ios_base&) ) {}

4
src/osgPlugins/osg/AsciiStreamOperator.h
View File

@ -49,10 +49,10 @@ public:
virtual void writeULong( unsigned long l ) virtual void writeULong( unsigned long l )
{ indentIfRequired(); *_out << l << ' '; } { indentIfRequired(); *_out << l << ' '; }
virtual void writeInt64( long long ll ) virtual void writeInt64( GLint64 ll )
{ indentIfRequired(); *_out << ll << ' '; } { indentIfRequired(); *_out << ll << ' '; }
virtual void writeUInt64( unsigned long long ull ) virtual void writeUInt64( GLuint64 ull )
{ indentIfRequired(); *_out << ull << ' '; } { indentIfRequired(); *_out << ull << ' '; }
virtual void writeFloat( float f ) virtual void writeFloat( float f )