Hi Paul, The revision to the CMakeLists.txt for the Occlusion query work around was checked in with revision number 8796:
You can browse the revision online via: http://www.openscenegraph.org/projects/osg/log/OpenSceneGraph/trunk/CMakeLists.txt The problem with taking this revision is that the checkin also includes my bump to the version number to 2.7.1 so you'd need to remove this. Perhaps just copying in the changes I made: # # Enable workaround for OpenGL driver crash with occlusion query # OPTION(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL "Set to ON to build OcclussionQueryNode with a workaround for multi-threaded OpenGL driver occlussion query crash. " OFF) IF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL) ADD_DEFINITIONS(-DFORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL) ENDIF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL) Would be easier. Robert. On Mon, Aug 25, 2008 at 6:01 PM, Paul Martz <[EMAIL PROTECTED]> wrote: > Thanks, I totally appreciate you adding the cmake support. > > I'm going to need this on the 2.6 branch; can you merge that over, or can > you tell me the svn rev for this fix and I'll merge it myself? (I don't > think I've ever tried to merge just a single change rather than a whole > tree, but I believe it should be possible...) > -Paul > > >> >> Hi Paul, Todd and Doug, >> >> I've now checked in Doug's workaround in OcclusionQueryNode.cpp, and >> also add CMake support for enabling the associated define. Just run >> ccmake . and then scroll down to the >> OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL option, and >> then change it from OFF to ON, and then rebuild. >> >> Cheers, >> Robert. >> _______________________________________________ >> osg-submissions mailing list >> [email protected] >> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-o > penscenegraph.org > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
