[osg-users] OpenSceneGraph-3.4.0-rc6 tagged

[Robert Osfield]

 Hi Terry,

Thanks for the testing and suggested fix.  I've found a simpler solution -
just change the GL.in to use #cmakedefine, so the GL.in now looks like:

 svn diff
Index: src/osg/GL.in
===================================================================
--- src/osg/GL.in       (revision 15005)
+++ src/osg/GL.in       (working copy)
@@ -29,6 +29,8 @@
#cmakedefine OSG_GL_VERTEX_FUNCS_AVAILABLE
#cmakedefine OSG_GL_VERTEX_ARRAY_FUNCS_AVAILABLE
#cmakedefine OSG_GL_FIXED_FUNCTION_AVAILABLE
+#cmakedefine GL_HEADER_HAS_GLINT64
+#cmakedefine GL_HEADER_HAS_GLUINT64

#define OSG_GL1_FEATURES @OSG_GL1_FEATURES@
#define OSG_GL2_FEATURES @OSG_GL2_FEATURES@
@@ -36,9 +38,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

    // Required for compatibility with glext.h sytle function definitions
of
@@ -117,7 +118,7 @@
#endif // GL_APIENTRY


-#if !GL_HEADER_HAS_GLINT64
+#ifndef GL_HEADER_HAS_GLINT64
    #ifdef _WIN32
        typedef __int64 GLint64;
    #else
@@ -125,7 +126,7 @@
    #endif
#endif

-#if !GL_HEADER_HAS_GLUINT64
+#ifndef GL_HEADER_HAS_GLUINT64
    #ifdef _WIN32
        typedef unsigned __int64 GLuint64;
    #else

I've tested this by toggling the test to an non existent typedef and it
correctly picks out that it's not available and doesn't define the
GL_HEADER_HAS_GLINT64
so I get a failure.  This should mean that it should work for you system
now.

BTW, what GL headers are you using that don't define GLuint64/GLint64?

Robert,


On 23 July 2015 at 07:54, Terry Welsh <mogumbo at gmail.com> wrote:

> Hi Robert,
> Thanks for tackling the GLint/GLuint problem. I looked into it a
> couple weeks ago but never discovered check_cxx_source_compiles or any
> other solution.
>
> One small issue: if your checks for GLint and GLuint fail, you get
> these lines in include/osg/GL
>
> #define GL_HEADER_HAS_GLINT64
> #define GL_HEADER_HAS_GLUINT64
>
> This causes errors because the code later in that file expects
>
> #define GL_HEADER_HAS_GLINT64 0
> #define GL_HEADER_HAS_GLUINT64 0
>
> I fixed it by adding the following to CMakeLists.txt
>
> @@ -593,6 +593,9 @@
>      int main() { GLint64 test; return 0; }"
>      GL_HEADER_HAS_GLINT64
>  )
> +IF(GL_HEADER_HAS_GLINT64 STREQUAL "")
> +    SET(GL_HEADER_HAS_GLINT64 0)
> +ENDIF()
>
>  check_cxx_source_compiles(
>      "${OPENGL_HEADER1}
> @@ -600,6 +603,9 @@
>      int main() { GLuint64 test; return 0; }"
>      GL_HEADER_HAS_GLUINT64
>  )
> +IF(GL_HEADER_HAS_GLUINT64 STREQUAL "")
> +    SET(GL_HEADER_HAS_GLUINT64 0)
> +ENDIF()
>
>
> --
> Terry Welsh
> http://www.reallyslick.com
>
>
> >
> > Message: 1
> > Date: Wed, 22 Jul 2015 16:09:09 +0100
> > From: Robert Osfield <robert.osfield at gmail.com>
> > To: OpenSceneGraph Users <osg-users at lists.openscenegraph.org>
> > Subject: [osg-users] OpenSceneGraph-3.4.0-rc6 tagged
> > Message-ID:
> >         <
> CAFN7Y+W1z+WOLYdNGtxSQtTZen4cgEC3H77n9Yqy1BnDXvmKjg at mail.gmail.com>
> > Content-Type: text/plain; charset="utf-8"
> >
> > Hi All,
> >
> > I have done some CMake work on handling whether the GL header provides
> the
> > GLuint64 and GLint64 typedefs which will hopefully help with address some
> > of platform specfic build errors with certain GL/ES headers.
> >
> >    - Zip file containing source code : OpenSceneGraph-3.4.0-rc6.zip
> >    <
> http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.4.0-rc6.zip
> >
> >    - Subversion tag for 3.4.0-rc6 : svn co
> >
> http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.4.
> >    <
> http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.4.0-rc6
> >0-rc6
> >    OpenSceneGraph
> >
> > My plan is now to make 3.4.0 tomorrow.
> >
> > Thanks in advance for any testing you can do.
> > Robert.
> _______________________________________________
> osg-users mailing list
> osg-users at lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openscenegraph.org/pipermail/osg-users-openscenegraph.org/attachments/20150723/e2ec03f1/attachment-0003.htm>